Adaptation barcode

Author: Bruno De Bel

loadInventory/inventoryparser.cpp

@@ -37,10 +37,10 @@ class StateParserDocumentState : public StateParserInventoryRootState{
 		return tmp;
 	}
 
-	std::string buildUnique(std::string type,std::string date,std::string seq,std::string sysnum,std::string paperid){
+	std::string buildUnique(std::string type,std::string date,std::string seq,std::string sysnum,std::string paperid, std::string barcode){
 
 		if ( type.compare("Monograph") == 0){
-			return sysnum;
+			return barcode;
 		}
 
 		char* str = strdup (type.c_str());
@@ -78,8 +78,10 @@ class StateParserDocumentState : public StateParserInventoryRootState{
 	   allValue.push_back(type);
 	   std::string sysnum = getMap(CTX.keyValues,"systemNumber");
 	   allValue.push_back(sysnum);
+	   std::string barcode= getMap(CTX.keyValues,"barcode");
+	   allValue.push_back(barcode);
 	   std::string seq = getMap(CTX.keyValues,"sequenceNumber");
-	   allValue.push_back(buildUnique(type,date,seq,sysnum,paperID));
+	   allValue.push_back(buildUnique(type,date,seq,sysnum,paperID,barcode));
 
 	   (CTX . sql) -> Store( allValue);
 

loadInventory/sqlloadinventory.cpp

@@ -5,9 +5,9 @@ SQLLoad::SQLLoad():zErrMsg(0),pStmt(0){
 	sql = "INSERT INTO INVENTORY "
 		              "( ID,AUTHOR,TITLE,TITLECOLLECTION,"
 		              "  SUBTITLE,PAPERID,LANGUAGES,ISSUENUMBER,"
-					  "  FORMALDATE,TYPE,SYSTEMNUMBER,UNIQUEBUILDKEY"
+					  "  FORMALDATE,TYPE,SYSTEMNUMBER,BARCODE,UNIQUEBUILDKEY"
 					  ") "
-		              "VALUES (?,?,?,?,?,?,?,?,?,?,?,?);";
+		              "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?);";
 }
 
 
@@ -31,7 +31,7 @@ void SQLLoad::Start(){
 
 void SQLLoad::Store(std::vector<std::string> allValue){
 	//std::cerr << allValue.size() << std::endl;
-	if ( allValue.size() != 12 ){
+	if ( allValue.size() != 13 ){
 		std::cerr << "Not enough field in file : " << allValue.size() << std::endl;
 		return ;
 	};
@@ -42,10 +42,7 @@ void SQLLoad::Store(std::vector<std::string> allValue){
 	int vt = 0;
 	for ( int i = 0; i < allValue.size(); i++){
 		pt++;
-		//std::cerr << "VAL" << pt <<" :" << allValue[vt] << std::endl;//DEBUG
-		//if ( vt!= 5 || allValue[vt].length() != 0 ) { // skip error on inventory
 			sqlite3_bind_text(pStmt, pt, allValue[vt].c_str(),allValue[vt].length(),SQLITE_STATIC);
-		//}
 		vt++;
 	}
 

project/createTable.txt

@@ -17,6 +17,7 @@ CREATE TABLE INVENTORY (
 	FORMALDATE varchar(40),
 	TYPE varchar(20),
 	SYSTEMNUMBER varchar(40),
+	BARCODE varchar(40),
 	UNIQUEBUILDKEY varchar(100) UNIQUE,
 	CHECKED INTEGER
 );