Nullable classifiers get placeholder value (temporarily).

moja-global · Aug 1, 2024 · 26628dd · 26628dd
1 parent 02003a0
commit 26628dd
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Source/moja.modules.cbm/src/flatrecord.cpp b/Source/moja.modules.cbm/src/flatrecord.cpp
@@ -39,7 +39,7 @@ namespace cbm {
 
                 valueStr += (boost::format("%1%%2%%3%") % quote % currentValue % quote).str();
             } else {
-                valueStr += "NULL";
+                valueStr += "'NA'";
             }
 
             classifierStr += valueStr;
@@ -132,7 +132,7 @@ namespace cbm {
                 % _year % classifierStr % _landClass % _ageClass % previousClassifierStr % _previousLandClass
                 % _previousAgeClass % (_disturbanceType.isNull() || _disturbanceType == "" ? "NULL" : ((boost::format("'%1%'") % _disturbanceType.value()).str()))
                 % (_disturbanceCode.isNull() ? "NULL" : pqxx::to_string(_disturbanceCode.value()))
-                % _srcPool % _dstPool % pqxx::to_string(_flux)).str();
+                % _srcPool % _dstPool % _flux).str();
         }
     }
 
@@ -216,7 +216,7 @@ namespace cbm {
         auto classifierStr = FlatRecordHelper::BuildClassifierValueString(_classifierValues, csvFormat);
 
         return (boost::format(csvFormat ? csvRecord : dbRecord)
-            % _year % classifierStr % _landClass % _ageClass % _pool % pqxx::to_string(_value)).str();
+            % _year % classifierStr % _landClass % _ageClass % _pool % _value).str();
     }
 
     std::vector<std::optional<std::string>> FlatPoolRecord::asVector() const {
@@ -300,7 +300,7 @@ namespace cbm {
         }
 
         return (boost::format(csvFormat ? csvRecord : dbRecord)
-            % _year % classifierStr % _module % errorStr % pqxx::to_string(_area)).str();
+            % _year % classifierStr % _module % errorStr % _area).str();
     }
 
     std::vector<std::optional<std::string>> FlatErrorRecord::asVector() const {
@@ -370,7 +370,7 @@ namespace cbm {
 
         auto classifierStr = FlatRecordHelper::BuildClassifierValueString(_classifierValues, csvFormat);
 
-        return (boost::format(csvFormat ? csvRecord : dbRecord) % _year % classifierStr % _landClass % _ageClass % pqxx::to_string(_area)).str();
+        return (boost::format(csvFormat ? csvRecord : dbRecord) % _year % classifierStr % _landClass % _ageClass % _area).str();
     }
 
     std::vector<std::optional<std::string>> FlatAgeAreaRecord::asVector() const {
@@ -467,7 +467,7 @@ namespace cbm {
 
         return (boost::format(csvFormat ? csvRecord : dbRecord)
             % _year % classifierStr % _landClass % _ageClass % previousClassifierStr % _previousLandClass
-            % _previousAgeClass % _disturbanceType % _disturbanceCode % pqxx::to_string(_area)).str();
+            % _previousAgeClass % _disturbanceType % _disturbanceCode % _area).str();
     }
 
     std::vector<std::optional<std::string>> FlatDisturbanceRecord::asVector() const {