[Gzz-commits] navidoc ./rst2any.py navidoc/link/docxx.py

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Changes by:     Asko Soukka <address@hidden>    03/06/05 03:42:45

Modified files:
        .              : rst2any.py 
        navidoc/link   : docxx.py 

Log message:
        clink reindex after new config

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/rst2any.py.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/docxx.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: navidoc/navidoc/link/docxx.py
diff -u navidoc/navidoc/link/docxx.py:1.2 navidoc/navidoc/link/docxx.py:1.3
--- navidoc/navidoc/link/docxx.py:1.2   Tue May 20 06:40:47 2003
+++ navidoc/navidoc/link/docxx.py       Thu Jun  5 03:42:45 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: docxx.py,v 1.2 2003/05/20 10:40:47 humppake Exp $
+#$Id: docxx.py,v 1.3 2003/06/05 07:42:45 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -39,14 +39,16 @@
 
 targets = {}
 
-for docxx in config.docxx_directories:
-    if os.path.isfile(slashify(docxx)+'index.html'):
-        index = open(slashify(docxx)+'index.html')
-        tuples = re.compile('<A HREF="([^<]*)">([^<]*)</A>')
-        tuples = tuples.findall(index.read())
-        index.close()
-        for link, name in tuples:
-            targets[name] = slashify(docxx)+link#
+def __init__():
+    global targets
+    for docxx in config.docxx_directories:
+        if os.path.isfile(slashify(docxx)+'index.html'):
+            index = open(slashify(docxx)+'index.html')
+            tuples = re.compile('<A HREF="([^<]*)">([^<]*)</A>')
+            tuples = tuples.findall(index.read())
+            index.close()
+            for link, name in tuples:
+                targets[name] = slashify(docxx)+link#
 
 class CLinkPackage(navidoc.Element):
     key = "clinkpackage"
Index: navidoc/rst2any.py
diff -u navidoc/rst2any.py:1.28 navidoc/rst2any.py:1.29
--- navidoc/rst2any.py:1.28     Wed Jun  4 08:19:18 2003
+++ navidoc/rst2any.py  Thu Jun  5 03:42:45 2003
@@ -21,7 +21,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: rst2any.py,v 1.28 2003/06/04 12:19:18 humppake Exp $
+#$Id: rst2any.py,v 1.29 2003/06/05 07:42:45 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -98,6 +98,9 @@
     dbg_config('Working directory: '+config.working_directory)
     dbg_config('Input file: '+config.input_filename)
     config.read_config(config, config.navidoc_conf)
+
+    navidoc.link.docxx.__init__() # init Doc++ linking information
+    # of course that could be done everytime, when processing a clink, but...
 
     if html:
         dbg('Compiling ReST '+input)