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

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/06/17 05:07:30

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

Log message:
        title regexp fix

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/__init__.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.39&tr2=1.40&r1=text&r2=text

Patches:
Index: navidoc/navidoc/link/__init__.py
diff -u navidoc/navidoc/link/__init__.py:1.23 
navidoc/navidoc/link/__init__.py:1.24
--- navidoc/navidoc/link/__init__.py:1.23       Wed Jun 11 05:32:59 2003
+++ navidoc/navidoc/link/__init__.py    Tue Jun 17 05:07:30 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: __init__.py,v 1.23 2003/06/11 09:32:59 humppake Exp $
+#$Id: __init__.py,v 1.24 2003/06/17 09:07:30 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -113,7 +113,7 @@
         if not self.error and set_title:
             file = open(path)                
             title = re.compile('<title>([^<]*)</title>')
-            strip = re.compile('[a-zA-ZåäöÅÄÖ\- ]*')
+            strip = re.compile('[a-zA-ZåäöÅÄÖ\-\_ ]*')
             title = title.findall(file.read())
             file.close()
             if len(title) > 0: self.title = strip.findall(title[0])[0]
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.39 navidoc/navidoc/mp/__init__.py:1.40
--- navidoc/navidoc/mp/__init__.py:1.39 Fri Jun 13 09:30:27 2003
+++ navidoc/navidoc/mp/__init__.py      Tue Jun 17 05:07:30 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: __init__.py,v 1.39 2003/06/13 13:30:27 humppake Exp $
+# $Id: __init__.py,v 1.40 2003/06/17 09:07:30 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -145,7 +145,7 @@
             except IOError:
                 raise MetapostException("Referenced file %s defined in %s was 
not found." % (refers[id], filepath))
 
-            strip = re.compile('[a-zA-ZåäöÅÄÖ\- ]*')
+            strip = re.compile('[a-zA-ZåäöÅÄÖ\-\_ ]*')
             if len(title) > 0: title = strip.findall(title[0])[0]
             else: title = refers[id].split("/")[-1].split(".")[0]