--- documentViewer/MpdlXmlTextServer.py	2010/11/24 11:32:36	1.213
+++ documentViewer/MpdlXmlTextServer.py	2010/12/06 10:41:55	1.215
@@ -143,7 +143,10 @@ class MpdlXmlTextServer(SimpleItem):
     def getGisPlaces(self, docinfo=None, pageinfo=None):
         """ Show all Gis Places of whole Page"""
         xpath='//place'
-        docpath = docinfo['textURLPath'] 
+        docpath = docinfo.get('textURLPath',None)
+        if not docpath:
+            return None
+
         url = docinfo['url']
         selfurl = self.absolute_url()
         pn = pageinfo['current']
@@ -198,7 +201,10 @@ class MpdlXmlTextServer(SimpleItem):
            
     def getOrigPages (self, docinfo=None, pageinfo=None):
         """Show original page """
-        docpath = docinfo['textURLPath'] 
+        docpath = docinfo.get('textURLPath',None)
+        if not docpath:
+            return None
+
         logging.debug ("docinfo['textURLPath']=%s"%(docinfo['textURLPath']))
         #url = docinfo['url']
         selfurl = self.absolute_url()
@@ -208,13 +214,27 @@ class MpdlXmlTextServer(SimpleItem):
         text = self.getServerData("page-fragment.xql","document=%s&mode=%s&pn=%s"%(docinfo['textURLPath'], 'text',  pn))
         dom =Parse(text)
         pagedivs = dom.xpath("//div[@class='pageNumberOrig']")
-        logging.debug("YYYYYYpagedivs :%s"%(pagedivs))
         if len(pagedivs)>0:
             originalPage= getTextFromNode(pagedivs[0])
             #return docinfo['originalPage']
             return originalPage
     
-    
+    def getAllPlaces (self, docinfo=None, pageinfo=None):
+        """Show all Places if no places than 0"""
+        docpath = docinfo['textURLPath'] 
+        selfurl = self.absolute_url()   
+        viewMode=  pageinfo['viewMode']
+        text = self.getServerData("page-fragment.xql","document=%s&mode=%s"%(docinfo['textURLPath'], 'text'))
+        dom =Parse(text)
+        pagedivs = dom.xpath("//div[@class='countPlaces']")
+        logging.debug ("pagedivs=%s"%(pagedivs))
+        #originalPage= getTextFromNode(pagedivs[0])
+        #return allPlaces
+        if len(pagedivs)>0:
+            originalPage= getTextFromNode(pagedivs[0])
+            #return docinfo['originalPage']
+            return originalPage
+           
     def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="regPlusNorm", highlightQuery=None, sn=None, optionToggle=None):
         """returns single page from fulltext"""
         docpath = docinfo['textURLPath']