[Gzz-commits] gzz/metacode umlrst.py

[Vesa Kaihlavirta]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Vesa Kaihlavirta <address@hidden>       03/02/03 05:05:39

Modified files:
        metacode       : umlrst.py 

Log message:
        Fixing more?

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umlrst.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text

Patches:
Index: gzz/metacode/umlrst.py
diff -u gzz/metacode/umlrst.py:1.19 gzz/metacode/umlrst.py:1.20
--- gzz/metacode/umlrst.py:1.19 Mon Feb  3 04:42:25 2003
+++ gzz/metacode/umlrst.py      Mon Feb  3 05:05:39 2003
@@ -185,7 +185,7 @@
 def embed_implicit(oldpath, name, path):
     """Terrible kludge to embed named diagram into path document
        with correct imagemap."""
-
+    #global settings
     #correcting relative paths
     path = path.replace(settings['to_javadoc'],
                  settings['javadoc'])
@@ -196,14 +196,13 @@
             path = (oldpath[0:slash+1] + path).replace("//", "/")
 
     #umltool_backup = settings.copy()
-    global settings
-    mputils_backup =  settings.copy()
+    settings2 =  settings.copy()
 
     umltool.set_transition_paths(path)
     slash = oldpath.rfind("/")
     if slash != -1:
-        settings['to_context'] = mputils.transition_path(path, 
oldpath[0:slash])
-    else: settings['to_context'] = mputils.transition_path(path, oldpath)
+        settings2['to_context'] = mputils.transition_path(path, 
oldpath[0:slash])
+    else: settings2['to_context'] = mputils.transition_path(path, oldpath)
 
     #the second pass - adds uml into html
     if path.endswith(".rst"): path = path[0:len(path)-4]
@@ -220,7 +219,7 @@
 
             #This should work also with non-generated UML-diagrams. Checks 
first
             #for generated and then if non-generated diagram exists.
-            if (os.path.isfile(mputils._slashify(settings['tmpdir'])\
+            if (os.path.isfile(mputils._slashify(settings2['tmpdir'])\
                                +name+".gen.uml")):
                 old_prefix = name + ".gen"
             else: old_prefix = name
@@ -233,16 +232,16 @@
             create_diagram(old_prefix, context_name, 0.5)
         
             #Cut&Pastes imagemap into html
-            imgmap = open(mputils._slashify(settings['tmpdir'])\
+            imgmap = open(mputils._slashify(settings2['tmpdir'])\
                           +context_name+".gen.html").read()
             out.write("<map id=\""+name+"\" name=\""+name+"\">\n")
             out.write(imgmap[imgmap.find('>',imgmap.find('<map'))+1:\
                              imgmap.find('</map>')])
             out.write("</map>\n")
             out.write("<div class=\"uml-implicit\">\n")
-            if (os.path.isfile(mputils._slashify(settings['tmpdir'])\
+            if (os.path.isfile(mputils._slashify(settings2['tmpdir'])\
                                +name+".gen.refers")):
-                refers = open(mputils._slashify(settings['tmpdir'])\
+                refers = open(mputils._slashify(settings2['tmpdir'])\
                                +name+".gen.refers").readlines()
                 out.write("<small><strong>"+name+"</strong>: \n")
                 for refer in refers:
@@ -253,7 +252,7 @@
 
             out.write("<a id=\""+name+"\"></a>\n")
             out.write("<img "\
-                      +"src=\""+mputils._slashify(settings['to_tmpdir'])\
+                      +"src=\""+mputils._slashify(settings2['to_tmpdir'])\
                       +context_name+".gen.png"\
                       +"\" usemap=\"#"+name+"\" alt=\""+name+"\" />\n")
             out.write("</div>\n")
@@ -263,4 +262,4 @@
             out.close()
         
     #umltool.settings = umltool_backup
-    settings = mputils_backup
+    #settings = mputils_backup