[Gzz-commits] navidoc/navidoc parser.py link/javadoc.py

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Changes by:     Asko Soukka <address@hidden>    03/04/25 14:00:02

Modified files:
        navidoc        : parser.py 
        navidoc/link   : javadoc.py 

Log message:
        jlinkpackage fix

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/parser.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/javadoc.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: navidoc/navidoc/link/javadoc.py
diff -u navidoc/navidoc/link/javadoc.py:1.5 navidoc/navidoc/link/javadoc.py:1.6
--- navidoc/navidoc/link/javadoc.py:1.5 Fri Apr 25 13:41:30 2003
+++ navidoc/navidoc/link/javadoc.py     Fri Apr 25 14:00:02 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: javadoc.py,v 1.5 2003/04/25 17:41:30 humppake Exp $
+#$Id: javadoc.py,v 1.6 2003/04/25 18:00:02 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -63,11 +63,16 @@
          """
          Set the Javadoc -target.
          """
-         parts = (config.linkpackage+'.'+self.target).split('.')
+         parts = self.target.split('.')
          self.target = '/'.join(parts);
+
          if re.match('^[a-z]', parts[-1]):
              self.target = slashify(self.target) + 'package-summary.html'
          else:
+             if len(config.linkpackage) > 0:
+                 package_parts = config.linkpackage.split('.')
+                 jlinkpackage = '/'.join(package_parts)
+                 self.target = slashify(jlinkpackage)+self.target
              self.target = self.target + '.html'
 
          for dir in config.javadoc_directories:
Index: navidoc/navidoc/parser.py
diff -u navidoc/navidoc/parser.py:1.11 navidoc/navidoc/parser.py:1.12
--- navidoc/navidoc/parser.py:1.11      Thu Apr 24 03:48:04 2003
+++ navidoc/navidoc/parser.py   Fri Apr 25 14:00:02 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: parser.py,v 1.11 2003/04/24 07:48:04 humppake Exp $
+# $Id: parser.py,v 1.12 2003/04/25 18:00:02 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -80,6 +80,7 @@
         Initializes ElementList by parsing all elements in list.
         """
         dbg("List: "+str(list))
+        config.linkpackage = ''
         config.element_list = self # XXX
         self.factor = ElementFactor([mp, link])
         self.list = []