Merge pull request #27 from CSIRO-enviro-informatics/handle-blank-column

Handle blank column and implement hiddenLabel

Author: jyucsiro

gui/Excel2ldrGui.py

@@ -18,7 +18,7 @@
 (c) 2017-2018 CSIRO Land and Water. Environmental Informatics Group. 
 </p>"""
 
-VERSION = 'v1.1.6'
+VERSION = 'v1.1.8'
 
 class HtmlWindow(wx.html.HtmlWindow):
     def __init__(self, parent, id, size=(600, 400)):
@@ -199,6 +199,8 @@ def run(self):
         registry_url = self.config['registry_url']
         updateOnlineRegisters = self.config['updateOnlineRegisters']
         verbose = self.config['verbose']
+        
+        #verbose = True
 
         registry_auth_url = registry_url + "/system/security/apilogin"
         #print(isMulti)

ldrpyutils/core.py

@@ -189,6 +189,7 @@ def build_graph_and_post(reginfo_obj, regitems_obj,
         "notation": 'reg',
         "note": 'skos',
         "altLabel": 'skos',
+        "hiddenLabel": 'skos',
         "label" : 'rdfs',
     }
 
@@ -378,8 +379,10 @@ def get_register_graph(register_id, register_info, register_items, nsMgr, prefix
 
             #iterate over the fields in the register
             for key in item:
+                if key == None:
+                    continue
                 #and create kvp's for any header
-                if key != 'id' and key != 'broader' and key != 'altLabel':
+                if key != 'id' and key != 'broader' and key != 'altLabel' and key != 'hiddenLabel':
                     # get prefix
                     currPrefix = ns_prefix_lookup[key]
                     currNs = prefix_idx[currPrefix]
@@ -399,6 +402,13 @@ def get_register_graph(register_id, register_info, register_items, nsMgr, prefix
                             print("AltLabel: " + v)
                             g.add((concept, SKOS.altLabel, Literal(v)))
 
+                if key == 'hiddenLabel':
+                    arrValues = processMultilineCell(item[key])
+                    if arrValues is not None:
+                        for v in arrValues:
+                            print("HiddenLabel: " + v)
+                            g.add((concept, SKOS.hiddenLabel, Literal(v)))
+
 
                 if key == 'description':
                     g.add((concept, SKOS.definition, Literal(item[key])))
@@ -440,8 +450,9 @@ def get_register_graph(register_id, register_info, register_items, nsMgr, prefix
     return g
 
 def validate_url(urlstring):
-    if urlstring.startswith("http"):
-        return validators.url(urlstring)
+    curr = str(urlstring)
+    if curr.startswith("http"):
+        return validators.url(curr)
     return False
 
 def create_concept_with_id(id, graph, prefix_idx):