add vscode file to .gitignore

.gitignore

@@ -1,2 +1,3 @@
 /build/
 /build/*
+.vscode/c_cpp_properties.json

fetcher.cc

@@ -1,31 +1,31 @@
-#include <sstream>
 #include <fstream>
+#include <sstream>
 
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
 
 #include <unistd.h>
 
-#include <curlpp/cURLpp.hpp>
 #include <curlpp/Easy.hpp>
-#include <curlpp/Options.hpp>
 #include <curlpp/Exception.hpp>
+#include <curlpp/Options.hpp>
+#include <curlpp/cURLpp.hpp>
 
 #define DEBUG_LEVEL -1
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
   std::string exbid, apikey;
   if (argc != 7) {
-    std::cout<<"Usage: "<<argv[0] <<" -e <exhibition id> -k <api key> -e <number of records>"<<std::endl;
+    std::cout << "Usage: " << argv[0]
+              << " -e <exhibition id> -k <api key> -e <number of records>"
+              << std::endl;
     exit(0);
   }
   int c;
   int numrec = 0;
   while ((c = getopt(argc, argv, "e:k:n:")) != -1)
-    switch(c)
-      {
+    switch (c) {
     case 'e':
       exbid = optarg;
       break;
@@ -42,10 +42,11 @@ int main(int argc, char *argv[])
   int numfetches = (numrec / 100) + 1;
   char url[256], outfilename[64];
   for (int i = 0; i < numfetches; i++) {
-    snprintf(
-      url,
-      sizeof url,
-      "https://api.dimu.org/api/solr/select?q=Kosta&wt=json&fq=(artifact.exhibitionUids:\"%s\")&start=%d&rows=100&api.key=%s", exbid.c_str(), i*100,  apikey.c_str());
+    snprintf(url, sizeof url,
+             "https://api.dimu.org/api/solr/"
+             "select?q=Kosta&wt=json&fq=(artifact.exhibitionUids:\"%s\")&start="
+             "%d&rows=100&api.key=%s",
+             exbid.c_str(), i * 100, apikey.c_str());
 
     std::cout << url << "\n";
 
@@ -63,21 +64,20 @@ int main(int argc, char *argv[])
       // Setting the URL to retrive.
       request1.setOpt(new curlpp::options::Url(url));
 
-    if (DEBUG_LEVEL > 0) std::cout << request1 << std::endl;
+      if (DEBUG_LEVEL > 0)
+        std::cout << request1 << std::endl;
 
       std::ofstream outfile;
       outfile.open(outfilename);
       outfile << curlpp::options::Url(url) << std::endl;
       outfile.close();
+    } catch (curlpp::LogicError &e) {
+      if (DEBUG_LEVEL > 0)
+        std::cout << e.what() << std::endl;
+    } catch (curlpp::RuntimeError &e) {
+      if (DEBUG_LEVEL > 0)
+        std::cout << e.what() << std::endl;
     }
-  catch ( curlpp::LogicError & e ) {
-    if (DEBUG_LEVEL > 0) std::cout << e.what() << std::endl;
-  }
-  catch ( curlpp::RuntimeError & e ) {
-    if (DEBUG_LEVEL > 0) std::cout << e.what() << std::endl;
-  }
-
- 
   }
   return 0;
 }

parser.cc

@@ -1,8 +1,8 @@
 #include <rapidjson/document.h>
 #include <rapidjson/filereadstream.h>
 
-#include <unistd.h>
 #include <cstdlib>
+#include <unistd.h>
 
 #include <algorithm>
 #include <cstdio>
@@ -15,14 +15,12 @@ std::string yearstr(int year) {
   return year == -1 ? "Unknown" : std::to_string(year);
 }
 
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
   int c;
   bool download_mode = false;
   int numfiles = 0;
   while ((c = getopt(argc, argv, "d:n:")) != -1)
-    switch(c)
-      {
+    switch (c) {
     case 'd': // download mode
       download_mode = true;
       break;
@@ -37,7 +35,11 @@ int main(int argc, char **argv)
   snprintf(filename, sizeof filename, "out.csv");
   std::ofstream out_file1;
   out_file1.open(filename);
-  out_file1<<"id, Caption/title, production start year, end year, Description, Item url, Image Source, image_filename, subjects, date published, collection name, museum name, exif_model, exif_iso, exif_focallength, exif_exposuretime, exif_aperture,  exif_datetimeoriginal, liceses\n";
+  out_file1 << "id, Caption/title, production start year, end year, "
+               "Description, Item url, Image Source, image_filename, subjects, "
+               "date published, collection name, museum name, exif_model, "
+               "exif_iso, exif_focallength, exif_exposuretime, exif_aperture,  "
+               "exif_datetimeoriginal, liceses\n";
   for (auto i = 0; i < numfiles; i++) {
     char in_file_i[64];
     snprintf(in_file_i, sizeof in_file_i, "data_%d.json", i);
@@ -45,8 +47,7 @@ int main(int argc, char **argv)
     FILE *fp = fopen(in_file_i, "rb");
     // Check if the file was opened successfully
     if (!fp) {
-      std::cerr << "Error: unable to open file"
-                << std::endl;
+      std::cerr << "Error: unable to open file" << std::endl;
       return -1;
     }
 
@@ -60,8 +61,7 @@ int main(int argc, char **argv)
 
     // Check if the document is valid
     if (doc.HasParseError()) {
-      std::cerr << "Error: failed to parse JSON document"
-                << std::endl;
+      std::cerr << "Error: failed to parse JSON document" << std::endl;
       fclose(fp);
       return 1;
     }
@@ -69,11 +69,9 @@ int main(int argc, char **argv)
     // Close the file
     fclose(fp);
 
-    if (doc.HasMember("response")
-        && doc["response"].IsObject()) {
+    if (doc.HasMember("response") && doc["response"].IsObject()) {
       const rapidjson::Value &response = doc["response"];
-      if (response.HasMember("docs")
-          && response["docs"].IsArray()) {
+      if (response.HasMember("docs") && response["docs"].IsArray()) {
         for (rapidjson::SizeType i = 0; i < response["docs"].Size(); i++) {
           // std::cout<<i<<std::endl;
           int yearb = -1, yeare = -1;
@@ -90,12 +88,14 @@ int main(int argc, char **argv)
           }
 
           if (article.HasMember("artifact.ingress.production.fromYear")) {
-            const rapidjson::Value& yearbval = article["artifact.ingress.production.fromYear"];
+            const rapidjson::Value &yearbval =
+                article["artifact.ingress.production.fromYear"];
             yearb = yearbval.GetInt();
           }
 
           if (article.HasMember("artifact.ingress.production.toYear")) {
-            const rapidjson::Value& yeareval = article["artifact.ingress.production.toYear"];
+            const rapidjson::Value &yeareval =
+                article["artifact.ingress.production.toYear"];
             yeare = yeareval.GetInt();
           }
 
@@ -111,40 +111,48 @@ int main(int argc, char **argv)
           int picid = -1;
           std::string picdim = "";
 
-        if (article.HasMember("artifact.hasPictures") && article["artifact.hasPictures"].GetBool() == true) {
+          if (article.HasMember("artifact.hasPictures") &&
+              article["artifact.hasPictures"].GetBool() == true) {
 
             if (article.HasMember("artifact.defaultMediaIdentifier")) {
-            const rapidjson::Value& mediaidv = article["artifact.defaultMediaIdentifier"];
+              const rapidjson::Value &mediaidv =
+                  article["artifact.defaultMediaIdentifier"];
               if (mediaidv.IsString()) {
                 mediaid = mediaidv.GetString();
               }
             }
 
-          if (article.HasMember("artifact.defaultPictureIndex") && article["artifact.defaultPictureIndex"].IsInt()) {
+            if (article.HasMember("artifact.defaultPictureIndex") &&
+                article["artifact.defaultPictureIndex"].IsInt()) {
               picid = article["artifact.defaultPictureIndex"].GetInt();
             }
 
-          if (article.HasMember("artifact.defaultPictureDimension") && article["artifact.defaultPictureDimension"].IsString()) {
+            if (article.HasMember("artifact.defaultPictureDimension") &&
+                article["artifact.defaultPictureDimension"].IsString()) {
               picdim = article["artifact.defaultPictureDimension"].GetString();
             }
           }
 
-        //  image file is at https://mm.dimu.org/image/<identifier>?dimension=<dim>
-        // as per documentation available at http://api.dimu.org/doc/public_api.html
+          //  image file is at
+          //  https://mm.dimu.org/image/<identifier>?dimension=<dim>
+          // as per documentation available at
+          // http://api.dimu.org/doc/public_api.html
           char imglink[128];
-        snprintf(imglink, sizeof imglink, "https://mm.dimu.org/image/%s", mediaid.c_str());
+          snprintf(imglink, sizeof imglink, "https://mm.dimu.org/image/%s",
+                   mediaid.c_str());
 
           char itemlink[128];
-	snprintf(itemlink, sizeof itemlink, "https://digitaltmuseum.se/%s", unique_id.c_str());
-
-        
+          snprintf(itemlink, sizeof itemlink, "https://digitaltmuseum.se/%s",
+                   unique_id.c_str());
 
           char descfilename[64];
-        snprintf(descfilename, sizeof descfilename, "%s.txt", article_id.c_str());
+          snprintf(descfilename, sizeof descfilename, "%s.txt",
+                   article_id.c_str());
 
           std::string description = "";
           if (article.HasMember("artifact.ingress.description")) {
-          const rapidjson::Value& descv = article["artifact.ingress.description"];
+            const rapidjson::Value &descv =
+                article["artifact.ingress.description"];
             if (descv.IsString()) {
               description = descv.GetString();
               std::replace(description.begin(), description.end(), ',', ':');
@@ -158,7 +166,8 @@ int main(int argc, char **argv)
 
           std::string subjects;
           if (article.HasMember("artifact.ingress.subjects")) {
-          const rapidjson::Value& subjv = article["artifact.ingress.subjects"];
+            const rapidjson::Value &subjv =
+                article["artifact.ingress.subjects"];
             if (subjv.IsArray()) {
               for (auto i = 0; i < subjv.GetArray().Size(); i++) {
                 subjects += subjv[i].GetString();
@@ -171,7 +180,8 @@ int main(int argc, char **argv)
 
           std::string publishdate;
           if (article.HasMember("artifact.publishedDate")) {
-          const rapidjson::Value& pubdatev = article["artifact.publishedDate"];
+            const rapidjson::Value &pubdatev =
+                article["artifact.publishedDate"];
             if (pubdatev.IsString()) {
               publishdate = pubdatev.GetString();
             }
@@ -182,7 +192,8 @@ int main(int argc, char **argv)
             if (article["artifact.ingress.license"].IsString())
               license = article["artifact.ingress.license"].GetString();
             else if (article["artifact.ingress.license"].IsArray()) {
-            for (auto i = 0; i<article[ "artifact.ingress.license"].Size(); i++) {
+              for (auto i = 0; i < article["artifact.ingress.license"].Size();
+                   i++) {
                 license += article["artifact.ingress.license"][i].GetString();
               }
             }
@@ -192,30 +203,35 @@ int main(int argc, char **argv)
           if (license.find("CC by") != std::string::npos) {
             is_cc_license = true;
             char imgfetch[256];
-          snprintf(imgfetch, sizeof imgfetch, "wget %s -O \"%s-%s.jpeg\"", imglink, article_id.c_str(), mediaid.c_str());
-          if (debug_level > 0) std::cout<<imgfetch<<std::endl;
+            snprintf(imgfetch, sizeof imgfetch, "wget %s -O \"%s-%s.jpeg\"",
+                     imglink, article_id.c_str(), mediaid.c_str());
+            if (debug_level > 0)
+              std::cout << imgfetch << std::endl;
             if (download_mode) {
               std::cout << "running in download mode\n";
               system(imgfetch);
-            if (debug_level >0) std::cout<<"Found CC by license, fetched the image for "<< mediaid<<"\n";
+              if (debug_level > 0)
+                std::cout << "Found CC by license, fetched the image for "
+                          << mediaid << "\n";
             }
           }
 
           if (!download_mode) {
             if (is_cc_license) {
               char exif_file[128];
-            snprintf(exif_file, sizeof exif_file, "%s-%s.jpeg.exif.json", article_id.c_str(), mediaid.c_str());
+              snprintf(exif_file, sizeof exif_file, "%s-%s.jpeg.exif.json",
+                       article_id.c_str(), mediaid.c_str());
               // Open the file
               FILE *exiffp = fopen(exif_file, "rb");
               if (!exiffp) {
-              std::cerr << "Error: unable to open file" << std::string(exif_file)
-                        << std::endl;
+                std::cerr << "Error: unable to open file"
+                          << std::string(exif_file) << std::endl;
                 return -1;
               }
 
-
               char exifreadBuffer[4096];
-            rapidjson::FileReadStream exifis(exiffp, exifreadBuffer, sizeof(exifreadBuffer));
+              rapidjson::FileReadStream exifis(exiffp, exifreadBuffer,
+                                               sizeof(exifreadBuffer));
               rapidjson::Document exifdoc;
               exifdoc.ParseStream(exifis);
 
@@ -226,57 +242,57 @@ int main(int argc, char **argv)
               }
               fclose(exiffp);
 
-            std::string exif_model, exif_iso, exif_focallength, exif_exposuretime, exif_aperture, exif_fnumber, exif_datetimeoriginal;
+              std::string exif_model, exif_iso, exif_focallength,
+                  exif_exposuretime, exif_aperture, exif_fnumber,
+                  exif_datetimeoriginal;
               if (exifdoc.IsArray()) {
                 if (exifdoc[0].IsObject()) {
                   if (exifdoc[0].GetObject().HasMember("Model")) {
                     exif_model = exifdoc[0].GetObject()["Model"].GetString();
                   }
                   if (exifdoc[0].GetObject().HasMember("ISO")) {
-                  exif_iso = std::to_string(exifdoc[0].GetObject()["ISO"].GetInt());
+                    exif_iso =
+                        std::to_string(exifdoc[0].GetObject()["ISO"].GetInt());
                   }
                   if (exifdoc[0].GetObject().HasMember("FocalLength")) {
-                  exif_focallength = exifdoc[0].GetObject()["FocalLength"].GetString();
+                    exif_focallength =
+                        exifdoc[0].GetObject()["FocalLength"].GetString();
                   }
                   if (exifdoc[0].GetObject().HasMember("ExposureTime")) {
                     if (exifdoc[0].GetObject()["ExposureTime"].IsString())
-                    exif_exposuretime = exifdoc[0].GetObject()["ExposureTime"].GetString();
+                      exif_exposuretime =
+                          exifdoc[0].GetObject()["ExposureTime"].GetString();
                   }
                   if (exifdoc[0].GetObject().HasMember("ApertureValue")) {
-                  exif_aperture = std::to_string(exifdoc[0].GetObject()["ApertureValue"].GetDouble());
+                    exif_aperture = std::to_string(
+                        exifdoc[0].GetObject()["ApertureValue"].GetDouble());
                   }
                   if (exifdoc[0].GetObject().HasMember("DateTimeOriginal")) {
-                  exif_datetimeoriginal = exifdoc[0].GetObject()["DateTimeOriginal"].GetString();
+                    exif_datetimeoriginal =
+                        exifdoc[0].GetObject()["DateTimeOriginal"].GetString();
                   }
                 }
               }
 
-
               out_file1 <<
                   /*  article["artifact.defaultMediaIdentifier"].GetString()<<
                       ", "<< article["artifact.defaultPictureIndex"].GetInt()<<
-                  ", "<< article["artifact.defaultPictureDimension"].GetString()<<
+                      ", "<<
+                     article["artifact.defaultPictureDimension"].GetString()<<
                       ", "<<*/
-              article_id <<
-              ", "<< title <<
-              ", "<< yearstr(yearb) <<
-              ", "<< yearstr(yeare) <<
-              ", "<< description <<
-	      ", "<< itemlink <<
-              ", "<< imglink <<
-              ", "<< article_id+"-"+ mediaid +".jpeg" <<
-              ", "<< subjects <<
-              ", "<< publishdate <<
-              ", "<<"Länge leve Kosta! exhibition" <<
-              ", "<<"Kulturparken Småland / Smålands museum" <<
-              ", "<< exif_model <<
-              ", "<< exif_iso <<
-              ", "<< exif_focallength <<
-              ", "<< exif_exposuretime <<
-              ", "<< exif_aperture <<
-              ", "<< exif_datetimeoriginal<<
-              ", "<< license <<
-              std::endl;
+                  article_id
+                        << ", " << title << ", " << yearstr(yearb) << ", "
+                        << yearstr(yeare) << ", " << description << ", "
+                        << itemlink << ", " << imglink << ", "
+                        << article_id + "-" + mediaid + ".jpeg"
+                        << ", " << subjects << ", " << publishdate << ", "
+                        << "Länge leve Kosta! exhibition"
+                        << ", "
+                        << "Kulturparken Småland / Smålands museum"
+                        << ", " << exif_model << ", " << exif_iso << ", "
+                        << exif_focallength << ", " << exif_exposuretime << ", "
+                        << exif_aperture << ", " << exif_datetimeoriginal
+                        << ", " << license << std::endl;
             }
           }
         }
@@ -286,4 +302,3 @@ int main(int argc, char **argv)
   out_file1.close();
   return 0;
 }
-