Changeset 631:0c3aab828864 in documentViewer

Timestamp:

Jul 2, 2015, 8:27:05 AM (9 years ago)

Author:

Dirk Wintergruen <dwinter@…>

Branch:

default

Message:

remove index meta ns

File:

• documentViewer.py (modified) (4 diffs)

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)