Changeset 70:0049d64aa464 in documentViewer

Timestamp:

Nov 4, 2008, 7:51:35 PM (16 years ago)

Author:

dwinter

Branch:

default

Message:

filepath introduced

File:

• documentViewer.py (modified) (7 diffs)

documentViewer.py

@@ -333 +333 @@
                         
         
-    def getAuthinfoFromIndexMeta(self,path,docinfo=None,dom=None):
+    def getAuthinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
         """gets authorization info from the index.meta file at path or given by dom"""
         logger("documentViewer (getauthinfofromindexmeta)", logging.INFO,"path: %s"%(path))
@@ -343 +343 @@
             
         if dom is None:
-            dom = self.getIndexMeta(getParentDir(path))
+            for x in range(cut+1):
+                path=getParentDir(path)
+            dom = self.getIndexMeta(path)
        
         acctype = dom.xpath("//access-conditions/access/@type")
@@ -355 +357 @@
     
         
-    def getBibinfoFromIndexMeta(self,path,docinfo=None,dom=None):
+    def getBibinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
         """gets bibliographical info from the index.meta file at path or given by dom"""
         logging.debug("documentViewer (getbibinfofromindexmeta) path: %s"%(path))
@@ -363 +365 @@
             
         if dom is None:
-            dom = self.getIndexMeta(getParentDir(path))
+            for x in range(cut+1):
+                path=getParentDir(path)
+            dom = self.getIndexMeta(path)
             
         # put in all raw bib fields as dict "bib"
@@ -509 +513 @@
         return docinfo
     
-    def getDocinfoFromImagePath(self,path,docinfo=None):
+    def getDocinfoFromImagePath(self,path,docinfo=None,cut=0):
         """path ist the path to the images it assumes that the index.meta file is one level higher."""
         logger("documentViewer (getdocinfofromimagepath)", logging.INFO,"path: %s"%(path))
@@ -520 +524 @@
         docinfo['imageURL'] = imageUrl
         
-        docinfo = self.getBibinfoFromIndexMeta(path,docinfo=docinfo)
-        docinfo = self.getAuthinfoFromIndexMeta(path,docinfo=docinfo)
+        docinfo = self.getBibinfoFromIndexMeta(path,docinfo=docinfo,cut=cut)
+        docinfo = self.getAuthinfoFromIndexMeta(path,docinfo=docinfo,cut=cut)
         return docinfo
     
@@ -541 +545 @@
         elif mode=="imagepath":
             docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo)
+        elif mode=="filepath":
+            docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo,cut=1)
         else:
             logger("documentViewer (getdocinfo)", logging.ERROR,"unknown mode!")