tweaks

danja · Dec 26, 2017 · e6ecc5c · e6ecc5c
1 parent 8f8e96c
commit e6ecc5c
Show file tree

Hide file tree

Showing 6 changed files with 1,110 additions and 14,708 deletions.
diff --git a/js/foowiki/core-static.js b/js/foowiki/core-static.js
@@ -116,6 +116,10 @@ function getImage(imageURI, callback) {
     var getPageUrl = FooWiki.sparqlQueryEndpoint + encodeURIComponent(getPageSparql) + "&output=xml";
 
     var makeDataURL = function (entryJSON) {
+      if(!entryJSON) {
+            console.log("makeDataURL empty entryJSON");
+            return "makeDataURL empty entryJSON";
+          }
             //   console.log("BBB");
             //   var entryXmlNames = ["base64"];
             // var entryJSON = sparqlXMLtoJSON(xml);
@@ -349,7 +353,7 @@ function makeLinkListHTML(entryArray) {
 
     for (var i = 0; i < entryArray.length; i++) {
         var entry = entryArray[i];
-        entry.uri = "page-static.html?uri=" + entry.uri; 
+        entry.uri = "page-static.html?uri=" + entry.uri;
         var link = templater(resultTemplate, entry);
         links += link;
     }

diff --git a/js/foowiki/core.js b/js/foowiki/core.js
@@ -74,9 +74,11 @@ function getResource(uri, entryHandler) {
     var getPageUrl = generateGetUrl(getPageSparqlTemplate, entry);
 
     var handleEntry = function (entryJSON) {
+      if(!entryJSON) { alert("no entry json")}
         console.log("handleEntry " + JSON.stringify(entryJSON));
         entryHandler(entry, entryJSON);
     };
+
     console.log("getPageUrl = " + getPageUrl);
     getJsonForSparqlURL(getPageUrl, handleEntry);
     // getDataForURL(handleEntry, getPageUrl);
@@ -126,7 +128,10 @@ function getImage(imageURI, callback) {
     var getPageUrl = FooWiki.sparqlQueryEndpoint + encodeURIComponent(getPageSparql) + "&output=xml";
 
     var makeDataURL = function (entryJSON) {
-            //   console.log("BBB");
+      if(!entryJSON) {
+            console.log("makeDataURL empty entryJSON");
+            return "makeDataURL empty entryJSON";
+          }
             //   var entryXmlNames = ["base64"];
             // var entryJSON = sparqlXMLtoJSON(xml);
             var src = "data:image/jpeg;base64," + entryJSON[0]["base64"];

diff --git a/js/foowiki/edit.js b/js/foowiki/edit.js
@@ -38,7 +38,7 @@ var populateEditPage = function (entry, entryJSON) {
     };
     setupTags("#maintagscontainer", pageMap, false);
     $("textarea").autoGrow();
-    $("#maintagscontainer").addClass("editable"); // not working 
+    $("#maintagscontainer").addClass("editable"); // not working
 };
 
 /**
@@ -87,7 +87,7 @@ function setupPosting() {
 
 
             }).fail(function () {
-                alert("error"); // use error banner
+                alert("error posting data (edit.js line 90)"); // use error banner
             });
         }
         var uri = getCurrentPageURI();
@@ -221,4 +221,4 @@ function submitTags(graphURI, uri, callback) {
     }).done(function () {
         callback();
     });
-}
+}
diff --git a/js/foowiki/sparql-connector.js b/js/foowiki/sparql-connector.js
@@ -24,7 +24,7 @@ function getJsonForSparqlURL(pageURL, callback) {
   //       doneCallback(json, getCurrentPageURI());
          callback(json);
      })  .fail(function() {
-    alert( "error" );
+    alert( "error in getJsonForSparqlURL sparql-connect line 27" );
   });
  }
 
@@ -44,18 +44,18 @@ function getJsonForSparqlURL(pageURL, callback) {
      // maybe force to ISO-8859-1, also known as Latin-1 instead?
 
      var $xml = $(xmlString);
-     
+
      var variables = $xml.find("variable");
-     
+
           if (variables.length == 0) {
          return false;
      }
      var jsonVariables = [];
-     
+
      variables.each(function () {
          jsonVariables.push($(this).attr("name"));
      });
-     
+
      var results = $xml.find("result");
 
      if (results.length == 0) {
@@ -76,7 +76,7 @@ function getJsonForSparqlURL(pageURL, callback) {
          }
          jsonResults.push(map);
      });
-     
+
     // console.log("RESULTS = "+JSON.stringify(jsonResults));
      return jsonResults;
- }
+ }