Changeset 83:ec12a2440daa in documentViewer

Timestamp:

Mar 8, 2010, 3:02:33 PM (15 years ago)

Author:

abukhman

Branch:

default

Message:

My last update Bukhman Andrey

File:

• documentViewer.py (modified) (8 diffs)

documentViewer.py

@@ -1 @@
-
 
 from OFS.Folder import Folder
@@ -12 +11 @@
 from Ft.Xml import EMPTY_NAMESPACE, Parse
 
+
 import Ft.Xml.XPath
-
+import xmlrpclib
 import os.path
 import sys
@@ -234 +234 @@
             return style
 
+    def getTextLanguage(self,url,docinfo):
+        docinfo['lang']=getTextFromNode(dom.xpath("//bib/lang")[0])
+        lang = urlencode({'':docinfo['lang']})
+        return lang
+        
         
     def isAccessible(self, docinfo):
@@ -425 +430 @@
 
         return docinfo
-
+    
+    
+    def getNumPages(self, xquery, docinfo=None): #New Method 24.02.2010
+       text=self.viewerTemplates.query.eval("/mpdl/interface/xquery.xql","document="+ docinfo['textURLPath'] +"&xquery="+str(xquery))
+       docinfo['numPages'] = text.count("<pb ")
+       return docinfo
+       
         
     def getDocinfoFromTextTool(self,url,dom=None,docinfo=None):
@@ -468 +479 @@
        if imageDirs and (len(imageDirs)>0):
            imageDir=getTextFromNode(imageDirs[0])
+           
        else:
            # we balk with no image tag / not necessary anymore because textmode is now standard
            #raise IOError("No text-tool info in %s"%(url))
            imageDir=""
-           docinfo['numPages']=1 # im moment einfach auf eins setzen, navigation ueber die thumbs geht natuerlich nicht
-       
+           #xquery="//pb"  
            docinfo['imagePath'] = "" # keine Bilder
            docinfo['imageURL'] = ""
-
+           
        if imageDir and archivePath:
            #print "image: ", imageDir, " archivepath: ", archivePath
@@ -505 +516 @@
        if textUrls and (len(textUrls)>0):
            textUrl=getTextFromNode(textUrls[0])
-           
-           docinfo['textURLPath'] = textUrl
-   
+           docinfo['textURLPath'] = textUrl   
+        
        presentationUrls=dom.xpath("//texttool/presentation")
        docinfo = self.getBibinfoFromIndexMeta(url,docinfo=docinfo,dom=dom)   # get info von bib tag
@@ -519 +529 @@
            else:
                presentationUrl=url + "/" + presentationPath
-               
+           docinfo=self.getNumPages('//pb', docinfo) #im moment einfach auf eins setzen, navigation ueber die thumbs geht natuerlich nicht    
            docinfo = self.getBibinfoFromTextToolPresentation(presentationUrl,docinfo=docinfo,dom=dom)
 
        docinfo = self.getAuthinfoFromIndexMeta(url,docinfo=docinfo,dom=dom)   # get access info
+       
        return docinfo
    
@@ -609 +620 @@
         pageinfo['end'] = start + grpsize
         if docinfo is not None:
+            
             np = int(docinfo['numPages'])
             pageinfo['end'] = min(pageinfo['end'], np)