V3.0 fixes1

api.py

@@ -260,7 +260,7 @@ def isEnumerationValue(self, layers='core'):
         if self.typeFlags.has_key('ev'):
             return self.typeFlags['ev']
         types = GetTargets(Unit.GetUnit("rdf:type"), self , layers=EVERYLAYER)
-        log.debug("isEnumerationValue() called on %s, found %s types. layers: %s" % (self.id, str( len( types ) ), layers ) )
+        #log.debug("isEnumerationValue() called on %s, found %s types. layers: %s" % (self.id, str( len( types ) ), layers ) )
         found_enum = False
         for t in types:
           if t.subClassOf(Unit.GetUnit("Enumeration"), layers=EVERYLAYER):
@@ -568,10 +568,10 @@ def GetAllTypes(layers='core'):
     """Return all types in the graph."""
     KEY = "AllTypes:%s" % layers
     if DataCache.get(KEY+'x',Utc):
-        logging.debug("DataCache HIT: %s" % KEY)
+        #logging.debug("DataCache HIT: %s" % KEY)
         return DataCache.get(KEY,Utc)
     else:
-        logging.debug("DataCache MISS: %s" % KEY)
+        #logging.debug("DataCache MISS: %s" % KEY)
         mynode = Unit.GetUnit("Thing", True)
         subbed = {}
         todo = [mynode]
@@ -591,10 +591,10 @@ def GetAllDataTypes(layers='core'):
     """Return all types in the graph."""
     KEY = "AllDataTypes:%s" % layers
     if DataCache.get(KEY+'x',Utc):
-        logging.debug("DataCache HIT: %s" % KEY)
+        #logging.debug("DataCache HIT: %s" % KEY)
         return DataCache.get(KEY,Utc)
     else:
-        logging.debug("DataCache MISS: %s" % KEY)
+        #logging.debug("DataCache MISS: %s" % KEY)
         mynode = Unit.GetUnit("DataType", True)
         subbed = {}
         todo = [mynode]
@@ -613,10 +613,10 @@ def GetAllEnumerationValues(layers='core'):
     global Utc
     KEY = "AllEnums:%s" % layers
     if DataCache.get(KEY,Utc):
-        logging.debug("DataCache HIT: %s" % KEY)
+        #logging.debug("DataCache HIT: %s" % KEY)
         return DataCache.get(KEY,Utc)
     else:
-        logging.debug("DataCache MISS: %s" % KEY)
+        #logging.debug("DataCache MISS: %s" % KEY)
         mynode = Unit.GetUnit("Enumeration", True)
         enums = {}
         subbed = {}
@@ -641,10 +641,10 @@ def GetAllProperties(layers='core'):
     global Utc
     KEY = "AllProperties:%s" % layers
     if DataCache.get(KEY,Utc):
-        logging.debug("DataCache HIT: %s" % KEY)
+        #logging.debug("DataCache HIT: %s" % KEY)
         return DataCache.get(KEY,Utc)
     else:
-        logging.debug("DataCache MISS: %s" % KEY)
+        #logging.debug("DataCache MISS: %s" % KEY)
         mynode = Unit.GetUnit("Thing")
         props = GetSources(Unit.GetUnit("rdf:type", True), Unit.GetUnit("rdf:Property", True), layers=EVERYLAYER)
         res = []
@@ -744,9 +744,6 @@ def __init__ (self, terms, original_html, microdata, rdfa, jsonld, egmeta, layer
         self.egmeta = egmeta
         self.layer = layer
         for term in terms:
-            if "id" in egmeta:
-              logging.debug("Created Example with ID %s and type %s" % ( egmeta["id"], term ))
-
             if(EXAMPLES.get(term, None) == None):
                 EXAMPLES[term] = []
             EXAMPLES.get(term).append(self)
@@ -796,7 +793,7 @@ def GetJsonLdContext(layers='core'):
 
     # Caching assumes the context is neutral w.r.t. our hostname.
     if DataCache.get('JSONLDCONTEXT'):
-        log.debug("DataCache: recycled JSONLDCONTEXT")
+        #log.debug("DataCache: recycled JSONLDCONTEXT")
         return DataCache.get('JSONLDCONTEXT')
     else:
         global namespaces
@@ -836,7 +833,7 @@ def GetJsonLdContext(layers='core'):
         jsonldcontext = jsonldcontext.replace("},}}","}\n    }\n}")
         jsonldcontext = jsonldcontext.replace("},","},\n") 
         DataCache.put('JSONLDCONTEXT',jsonldcontext)
-        log.debug("DataCache: added JSONLDCONTEXT")
+        #log.debug("DataCache: added JSONLDCONTEXT")
         return jsonldcontext
 
 
@@ -851,7 +848,7 @@ def inLayer(layerlist, node):
     if (node is None):
         return False
     if len(GetTargets(Unit.GetUnit("rdf:type"), node, layers=layerlist) ) > 0:
-        log.debug("Found typeOf for node %s in layers: %s"  % (node.id, layerlist ))
+        #log.debug("Found typeOf for node %s in layers: %s"  % (node.id, layerlist ))
         return True
     if len(GetTargets(Unit.GetUnit("rdfs:subClassOf"), node, layers=layerlist) ) > 0:
     # TODO: should we really test for any mention of a term, not just typing?
@@ -865,7 +862,7 @@ def read_file (filename):
     file_path = full_path(filename)
 
     import codecs
-    log.debug("READING FILE: filename=%s file_path=%s " % (filename, file_path ) )
+    #log.debug("READING FILE: filename=%s file_path=%s " % (filename, file_path ) )
     for line in codecs.open(file_path, 'r', encoding="utf8").readlines():
         strs.append(line)
     return "".join(strs)

parsers.py

@@ -51,7 +51,7 @@ def nextPart(self, next):
 
     def process_example_id(self, m):
         self.egmeta["id"] = m.group(1)
-        logging.debug("Storing ID: %s" % self.egmeta["id"] )
+        #logging.debug("Storing ID: %s" % self.egmeta["id"] )
         return ''
 
     def parse (self, contents):
@@ -70,12 +70,12 @@ def parse (self, contents):
                 api.Example.AddExample(self.terms, self.preMarkupStr, self.microdataStr, self.rdfaStr, self.jsonStr, self.egmeta)
                 self.initFields()
                 typelist = re.split(':', line)
-                logging.debug("TYPE INFO: '%s' " % line );
+                #logging.debug("TYPE INFO: '%s' " % line );
                 tdata = egid.sub(self.process_example_id, typelist[1]) # strips IDs, records them in egmeta["id"]
                 ttl = tdata.split(',')
                 for ttli in ttl:
                     ttli = re.sub(' ', '', ttli)
-                    logging.debug("TTLI: %s " % ttli); # danbri tmp
+                    #logging.debug("TTLI: %s " % ttli); # danbri tmp
                     self.terms.append(ttli)
             else:
                 tokens = ["PRE-MARKUP:", "MICRODATA:", "RDFA:", "JSON:"]
@@ -89,8 +89,6 @@ def parse (self, contents):
         self.nextPart('TYPES:') # should flush on each block of examples
         api.Example.AddExample(self.terms, self.preMarkupStr, self.microdataStr, self.rdfaStr, self.jsonStr, self.egmeta) # should flush last one
         #logging.info("Final AddExample called with terms %s " % self.terms)
-        for t in self.terms:
-            logging.debug("Adding %s" % "".join( [" ; %s " % t for t in self.terms] ) )
 
 
 class UsageFileParser:

sdoapp.py

@@ -345,7 +345,8 @@ class ShowUnit (webapp2.RequestHandler):
 
     def emitCacheHeaders(self):
         """Send cache-related headers via HTTP."""
-        self.response.headers['Cache-Control'] = "public, max-age=43200" # 12h
+        self.response.headers['Cache-Control'] = "public, max-age=600" # 10m
+        #self.response.headers['Cache-Control'] = "public, max-age=43200" # 12h
         self.response.headers['Vary'] = "Accept, Accept-Encoding"
 
     def GetCachedText(self, node, layers='core'):
@@ -957,8 +958,11 @@ def handleHomepage(self, node):
         https://github.com/rvguha/schemaorg/issues/5
         https://github.com/rvguha/schemaorg/wiki/JsonLd
         """
-        accept_header = self.request.headers.get('Accept').split(',')
-        log.info("Home page - accepts: %s" % self.request.headers.get('Accept'))
+        accept_header = self.request.headers.get('Accept')
+        if accept_header:
+            accept_header = accept_header.split(',')
+        else:
+            accept_header = ""
 
         # Homepage is content-negotiated. HTML or JSON-LD.
         mimereq = {}
@@ -983,11 +987,11 @@ def handleHomepage(self, node):
             # TODO: pass in extension, base_domain etc.
             sitekeyedhomepage = "homepage %s" % getSiteName()
             hp = DataCache.get(sitekeyedhomepage)
+            self.response.headers['Content-Type'] = "text/html"
             self.emitCacheHeaders()
             if hp != None:
                 self.response.out.write( hp )
                 #log.info("Served datacache homepage.tpl key: %s" % sitekeyedhomepage)
-                log.debug("Served datacache homepage.tpl key: %s" % sitekeyedhomepage)
             else:
 
 
@@ -2109,16 +2113,17 @@ def warmup(self):
         global Warmer
         if WarmedUp:
             return
-        log.info("Instance[%s] received Warmup request at %s" % (modules.get_current_instance_id(), global_vars.time_start) )
+        log.debug("Instance[%s] received Warmup request at %s" % (modules.get_current_instance_id(), datetime.datetime.utcnow()) )
         Warmer.warmAll()
-        log.info("Instance[%s] completed Warmup request at %s" % (modules.get_current_instance_id(), global_vars.time_start) )
+        log.debug("Instance[%s] completed Warmup request at %s" % (modules.get_current_instance_id(), datetime.datetime.utcnow()) )
 
 class WarmupTool():
 
     def __init__(self):
         self.types = []
         self.props = []
         self.enums = []
+        self.context = False
 
     def stepWarm(self,all=False):
         global WarmedUp
@@ -2142,6 +2147,9 @@ def stepWarm(self,all=False):
                     self.enums.append(l)
                     GetAllEnumerationValues(l)
                     break
+        elif not self.context:
+            self.context = True
+            GetJsonLdContext(layers=ALL_LAYERS)
         else:
             WarmedUp = True
 
@@ -2158,7 +2166,7 @@ def templateRender(templateName,values=None):
     extComment = ""
     extVers = ""
     extName = ""
-    log.info("EXDEF '%s'" % extDef)
+    #log.info("EXDEF '%s'" % extDef)
     if extDef:
         extComment = GetComment(extDef,ALL_LAYERS)
         if extComment == "No comment":
@@ -2221,11 +2229,11 @@ def my_shutdown_hook():
 ThreadVars = threading.local()
 def getAppVar(var):
     ret = getattr(ThreadVars, var, None)
-    log.debug("got var %s as %s" % (var,ret))
+    #log.debug("got var %s as %s" % (var,ret))
     return ret
 
 def setAppVar(var,val):
-    log.debug("Setting var %s to %s" % (var,val))
+    #log.debug("Setting var %s to %s" % (var,val))
     setattr(ThreadVars,var,val)
 
 def setHttpScheme(val):