Changes in [630:25295ceb11b1:633:5d1534bd19b3] in documentViewer

Files:

• MpiwgXmlTextServer.py (modified) (3 diffs)
• css/docuviewer.css (modified) (1 diff)
• documentViewer.py (modified) (4 diffs)

MpiwgXmlTextServer.py

@@ -304 +304 @@
             textParams['outputFormat'] = 'html'
         
+        
+      
         try:
             # fetch the page
+            
+           
+            
+            
             pagexml = self.getServerData("query/GetPage",urllib.urlencode(textParams))
             dom = ET.fromstring(pagexml)
@@ -372 +378 @@
                 # delete non-matching children of a-tag and suppress remaining tag name
                 atag = wtag.find("*[@class='dictionary']")
+                
+                if atag is None: #nicht gefunden weil noch andere Eintraege im class tag
+                    for w in wtag.findall("a"):  
+                        val = w.attrib.get("class","")
+                        if val.startswith("dictionary"):
+                                atag=w
+                                break
+                
+                
+                
+                
+                
                 if normMode == 'orig':
                     atag.remove(atag.find("span[@class='reg']"))
@@ -387 +405 @@
             else:
                 # delete a-tag
-                wtag.remove(wtag.find("*[@class='dictionary']"))
+               
+
+                wt =  wtag.find("*[@class='dictionary']")  
+                
+                if wt is None: #nicht gefunden weil noch andere Eintraege im class tag vorhanden sind
+                    for w in wtag.findall("a"):  
+                        val = w.attrib.get("class","")
+                        if val.startswith("dictionary"):
+                                wt=w
+                                break
+                
+                
+                
+                 
+                wtag.remove(wt)
                 # delete non-matching children and suppress remaining tag name
                 if normMode == 'orig':

css/docuviewer.css

@@ -4 +4 @@
  * Robert Casties 2012.
  */
+ 
+ 
+ .iliese {
+ background-color: lime;
+ }
+ 
+ 
+ 
 body {
     background-color: #ebebeb;

documentViewer.py

@@ -19 +19 @@
 from SrvTxtUtils import getInt, utf8ify, getText, getHttpData, refreshingImageFileIndexHtml, sslifyUrl
     
+
+INDEXMETA_NS="http://md.mpiwg-berlin.mpg.de/ns/indexMeta#"
+
+def removeINDEXMETA_NS(root): #entfernt den namespace von indexmeta aus dem dom #TODO evertyhing should be changed that it can deal with NS
+    for elem in root.getiterator():
+        print ("ETAG")
+        print(elem.tag)
+        if not hasattr(elem.tag, 'find'): continue  # (1)
+        
+        i = elem.tag.find('{%s}'%INDEXMETA_NS)
+        if i >= 0:
+            elem.tag = elem.tag[i+len(('{%s}'%INDEXMETA_NS)):]
+
+        print(elem.tag)
 
 def getMDText(node):
@@ -530 +544 @@
             # url points to document dir or index.meta
             metaDom = self.metadataService.getDomFromPathOrUrl(url)
+            removeINDEXMETA_NS(metaDom)
+
             if metaDom is None:
                 raise IOError("Unable to find index.meta for mode=texttool!")
@@ -536 +552 @@
             if url.startswith('/mpiwg/online/'):
                 docUrl = url.replace('/mpiwg/online/', '', 1)
+        elif mode=="textpath":
+            #url points to an textfile
+            #index.meta optional
+            #assume index.meta in parent dir
+            docUrl = getParentPath(url)
+            docinfo['viewmode'] = "text"
+            
+            try:
+                metaDom = self.metadataService.getDomFromPathOrUrl(docUrl)
+
+                removeINDEXMETA_NS(metaDom)
+
+
+                
+            except:
+                metaDom = None
+            #metaDom = self.metadataService.getDomFromPathOrUrl(docUrl)
+            #docinfo['imagePath'] = url.replace('/mpiwg/online', '', 1)
+            docinfo['textURLPath'] = url.replace('/mpiwg/online', '', 1)
+            docinfo['textURL'] = url
+            if docinfo.get("creator", None) is None:
+                docinfo['creator'] = "" 
+            
+            if docinfo.get("title", None) is None:
+                docinfo['title'] = "" 
+
+            if docinfo.get("documentPath", None) is None:
+                docinfo['documentPath'] = url.replace('/mpiwg/online', '', 1)
+                docinfo['documentPath'] = url.replace('/pages', '', 1)
+                
+            docinfo['numPages'] = 1
 
         elif mode=="imagepath":
             # url points to folder with images, index.meta optional
             # asssume index.meta in parent dir
-            docUrl = getParentPath(url)
+            
             metaDom = self.metadataService.getDomFromPathOrUrl(docUrl)
+            
             docinfo['imagePath'] = url.replace('/mpiwg/online', '', 1)
             
@@ -575 +623 @@
         docinfo['documentUrl'] = docUrl
         # process index.meta contents
-        if metaDom is not None and metaDom.tag == 'resource':
+        
+        if metaDom is not None and (metaDom.tag == 'resource' or metaDom.tag == "{%s}resource"%INDEXMETA_NS):
+            print("MD")
             # document directory name and path
             resource = self.metadataService.getResourceData(dom=metaDom, recursive=1)
             if resource:
                 docinfo = self.getDocinfoFromResource(docinfo, resource)
-
+           
             # texttool info
             texttool = self.metadataService.getTexttoolData(dom=metaDom, recursive=1, all=True)