[Gzz-commits] navidoc/navidoc link/__init__.py mp/__init__.py

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Changes by:     Asko Soukka <address@hidden>    03/05/23 10:37:14

Modified files:
        navidoc/link   : __init__.py 
        navidoc/mp     : __init__.py 

Log message:
        fix title

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/__init__.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.33&tr2=1.34&r1=text&r2=text

Patches:
Index: navidoc/navidoc/link/__init__.py
diff -u navidoc/navidoc/link/__init__.py:1.18 
navidoc/navidoc/link/__init__.py:1.19
--- navidoc/navidoc/link/__init__.py:1.18       Fri May 23 10:17:28 2003
+++ navidoc/navidoc/link/__init__.py    Fri May 23 10:37:14 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: __init__.py,v 1.18 2003/05/23 14:17:28 humppake Exp $
+#$Id: __init__.py,v 1.19 2003/05/23 14:37:14 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -111,9 +111,9 @@
             file = open(path)                
             title = re.compile('<title>([^<]*)</title>')
             strip = re.compile('[a-zA-ZåäöÅÄÖ ]*')
-            self.title = title.findall(file.read())[0]
+            title = title.findall(file.read())
             file.close()
-            if len(self.title) == 0: self.title = 
path.split("/")[-1].split(".")[0]
+            if len(title) > 0: self.title = strip.findall(title[0])[0]
 
         if not self.error and os.path.abspath(path) \
            == 
os.path.abspath(slashify(config.working_directory)+config.output_filename):
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.33 navidoc/navidoc/mp/__init__.py:1.34
--- navidoc/navidoc/mp/__init__.py:1.33 Fri May 23 09:41:40 2003
+++ navidoc/navidoc/mp/__init__.py      Fri May 23 10:37:14 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: __init__.py,v 1.33 2003/05/23 13:41:40 humppake Exp $
+# $Id: __init__.py,v 1.34 2003/05/23 14:37:14 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -134,15 +134,14 @@
             try:
                 refers_file = open(refers[id], 'r')                
                 title = re.compile('<title>([^<]*)</title>')
-                title = title.findall(refers_file.read())[0]
+                title = title.findall(refers_file.read())
                 refers_file.close()
             except IOError:
                 raise MetapostException("Referenced file %s defined in %s was 
not found." % (refers[id], filepath))
 
-# Could just a <title> be good enough for the title :P
-#            strip = re.compile('[a-zA-ZåäöÅÄÖ+ ]*')
-#            if len(title) > 0: title = "".join(strip.findall(title[0]))
-            if len(title) == 0: title = refers[id].split("/")[-1].split(".")[0]
+            strip = re.compile('[a-zA-ZåäöÅÄÖ ]*')
+            if len(title) > 0: title = strip.findall(title[0])[0]
+            else: title = refers[id].split("/")[-1].split(".")[0]
 
             if config.link_base_directory == None:
                 target = relative_path(config.working_directory, refers[id])