Skip to content

Commit 23862f3

Browse files
Bruno De BelBruno De Bel
Bruno De Bel
authored and
Bruno De Bel
committed
improvment of error message
1 parent e61b6ad commit 23862f3

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

‎project/verifyBook.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -25,31 +25,31 @@ void verifyBook::check(int check,metsparserContext& context){
2525

2626
std::string title = buildTitle( context.inventory.inventoryMODSMD_PRINT);
2727
if ( invent.title.compare(title)) {
28-
hError -> getError(cat_bookinventoryTitle,"METS","DMDSEC MODSMD_PRINT", "wrong title:" + context.inventory.inventoryMODSMD_PRINT.title +" against :"+ invent.title ,context.currentMetsFile,context.inventory.inventoryMODSMD_PRINT.title);
28+
hError -> getError(cat_bookinventoryTitle,"METS","DMDSEC MODSMD_PRINT", "Wrong title. Found '" + context.inventory.inventoryMODSMD_PRINT.title +"' but should be "+ invent.title ,context.currentMetsFile,context.inventory.inventoryMODSMD_PRINT.title);
2929
}
3030

3131
title = buildTitle( context.inventory.inventoryMODSMD_COLLECTION); // in the xml in title
3232
if ( invent.titlecollection.compare(title)) {
33-
hError -> getError(cat_bookinventoryTitle,"METS","DMDSEC MODSMD_COLLECTION", "wrong title collection:" + context.inventory.inventoryMODSMD_COLLECTION.title +" against :"+ invent.titlecollection ,context.currentMetsFile,context.inventory.inventoryMODSMD_COLLECTION.title);
33+
hError -> getError(cat_bookinventoryTitle,"METS","DMDSEC MODSMD_COLLECTION", "Wrong title collection. Found '" + context.inventory.inventoryMODSMD_COLLECTION.title +"' but should be "+ invent.titlecollection ,context.currentMetsFile,context.inventory.inventoryMODSMD_COLLECTION.title);
3434
}
3535

3636
if ( invent.publisher.compare(context.inventory.inventoryMODSMD_PRINT.publisher)) {
37-
hError -> getError(cat_bookinventoryTitle,"METS","DMDSEC MODSMD_PRINT", "wrong publisher:" + context.inventory.inventoryMODSMD_PRINT.publisher +" against :"+ invent.publisher ,context.currentMetsFile,context.inventory.inventoryMODSMD_PRINT.publisher);
37+
hError -> getError(cat_bookinventoryTitle,"METS","DMDSEC MODSMD_PRINT", "Wrong publisher. Found '" + context.inventory.inventoryMODSMD_PRINT.publisher +"' but should be "+ invent.publisher ,context.currentMetsFile,context.inventory.inventoryMODSMD_PRINT.publisher);
3838
}
3939

4040
if ( invent.printer.compare(context.inventory.inventoryMODSMD_PRINT.printer)) {
41-
hError -> getError(cat_bookinventoryTitle,"METS","DMDSEC MODSMD_PRINT", "wrong printer:" + context.inventory.inventoryMODSMD_PRINT.printer +" against :"+ invent.printer ,context.currentMetsFile,context.inventory.inventoryMODSMD_PRINT.printer);
41+
hError -> getError(cat_bookinventoryTitle,"METS","DMDSEC MODSMD_PRINT", "Wrong printer. Found '" + context.inventory.inventoryMODSMD_PRINT.printer +"' but should be "+ invent.printer ,context.currentMetsFile,context.inventory.inventoryMODSMD_PRINT.printer);
4242
}
4343

4444

4545
if ( invent.callnumber.compare(context.inventory.inventoryMODSMD_PRINT.callnumber)) {
46-
hError -> getError(cat_bookinventoryTitle,"METS","DMDSEC MODSMD_PRINT", "wrong callNumber:" + context.inventory.inventoryMODSMD_PRINT.callnumber +" against :"+ invent.callnumber ,context.currentMetsFile,context.inventory.inventoryMODSMD_PRINT.callnumber);
46+
hError -> getError(cat_bookinventoryTitle,"METS","DMDSEC MODSMD_PRINT", "Wrong callNumber. Found '" + context.inventory.inventoryMODSMD_PRINT.callnumber +"' but should be "+ invent.callnumber ,context.currentMetsFile,context.inventory.inventoryMODSMD_PRINT.callnumber);
4747
}
4848

4949

5050
string partNumberBuild = buildPartNumber(invent.yearnumber,invent.issuenumber);
5151
if ( partNumberBuild . compare(context.inventory.inventoryMODSMD_PRINT.partNumber)){
52-
hError -> getError(cat_bookinventoryTitle,"METS","DMDSEC MODSMD_PRINT", "wrong partNumber:" + context.inventory.inventoryMODSMD_PRINT.partNumber +" against :"+ partNumberBuild ,context.currentMetsFile,context.inventory.inventoryMODSMD_PRINT.partNumber);
52+
hError -> getError(cat_bookinventoryTitle,"METS","DMDSEC MODSMD_PRINT", "Wrong partNumber. Found '" + context.inventory.inventoryMODSMD_PRINT.partNumber +"' but should be "+ partNumberBuild ,context.currentMetsFile,context.inventory.inventoryMODSMD_PRINT.partNumber);
5353
}
5454

5555

‎project/verifyEmptyMix.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ void verifyEmptyMix::check(int check ,metsparserContext& context){
1313

1414
for ( std::map<std::string,std::string>::iterator it = context.MixContainer.begin(); it != context.MixContainer.end(); it++ ){
1515

16-
hError -> getError(cat_emptymix,"METS","mix:mix empty",it->first + " empty Tag",context.currentMetsFile,it->first);
16+
hError -> getError(cat_emptymix,"METS","mix:mix empty","Tag <mix:"+it->first + "> is not define, but is mandatory",context.currentMetsFile,it->first);
1717

1818
}
1919

2020
for ( std::map<std::string,std::string>::iterator it = context.MixContainerNotDefine.begin(); it != context.MixContainerNotDefine.end(); it++ ){
2121

22-
hError -> getError(cat_emptymix,"METS","mix:mix empty",it->first + " Mandatory Tag not define",context.currentMetsFile,"");
22+
hError -> getError(cat_emptymix,"METS","mix:mix empty","Tag <mix:"+it->first + "> is not define, but is mandatory",context.currentMetsFile,"");
2323

2424
}
2525

‎project/verifydatefolder.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ verifydatefolder::verifydatefolder(errorHandler *hError,std::string &currentMets
1010
if ( min <= currentMetsPath.length() ) {
1111
if (currentMetsFile.substr(0,13)!=currentMetsPath.substr(currentMetsPath.length()-min,currentMetsPath.length()))
1212
{
13-
hError->getError(cat_wrongFolderName,"METS","FOLDER", "Name of Metsfile : " + currentMetsFile.substr(0,13) + " != Name of folder :" + currentMetsPath.substr(currentMetsPath.length()-min,currentMetsPath.length()) ,currentMetsFile,"");
13+
hError->getError(cat_wrongFolderName,"METS","FOLDER", "Wrong naming. Mets file '" + currentMetsFile.substr(0,13) + " and folder '" + currentMetsPath.substr(currentMetsPath.length()-min,currentMetsPath.length())+"'" ,currentMetsFile,"");
1414
}
1515
}else{
16-
hError->getError(cat_wrongFolderName,"METS","FOLDER", "Name of Metsfile : " + currentMetsFile.substr(0,13) + " != Name of folder :" + currentMetsPath.substr(0,currentMetsPath.length()) ,currentMetsFile,"");
16+
hError->getError(cat_wrongFolderName,"METS","FOLDER", "Wrong naming(bad length). Mets file '" + currentMetsFile.substr(0,13) + " and folder '" + currentMetsPath.substr(0,currentMetsPath.length())+"'" ,currentMetsFile,"");
1717
}
1818
}

0 commit comments

Comments
 (0)