some tiny fixes.

diff --git a/markupper.py b/markupper.py
index d839896..945e8d3 100755 (executable)
--- a/markupper.py
+++ b/markupper.py
@@ -483,9 +483,9 @@ class Markupper(object):
             imgname = os.path.join(self._image_dir, imgname)
             imgname_s = re.sub(r"(.[A-Za-z0-9_]+)$", r"_s\1", imgname)
         elif not match_o2 == None:
             imgname = os.path.join(self._image_dir, imgname)
             imgname_s = re.sub(r"(.[A-Za-z0-9_]+)$", r"_s\1", imgname)
         elif not match_o2 == None:

-            imgname = match_o1.group(1)
+            imgname = match_o2.group(1)

             imgname = os.path.join(self._image_dir, imgname)
             imgname = os.path.join(self._image_dir, imgname)

-            imgname_s = match_o1.group(2)
+            imgname_s = match_o2.group(2)

 
         geom = self._get_png_geom(imgname_s)
         if geom:
 
         geom = self._get_png_geom(imgname_s)
         if geom:

diff --git a/merge_csv.py b/merge_csv.py
index 66bf463..62edbc8 100755 (executable)
--- a/merge_csv.py
+++ b/merge_csv.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 

-import os, sys
+import os
+import sys

 import codecs
 
 sys.stdout = codecs.getwriter('utf_8')(sys.stdout)
 import codecs
 
 sys.stdout = codecs.getwriter('utf_8')(sys.stdout)


@@ -35,17 +36,17 @@ otp_file = codecs.open(otp_data_path, "r", input_codec)
 updated_dict = {}
 ga_notfounds = []
 for row in otp_file:
 updated_dict = {}
 ga_notfounds = []
 for row in otp_file:

-#0   1     2      3   4        5    6
-#url,title,editor,PVs,comments,date,tags
+#0   1     2    3
+#url,title,date,tags

        items = row.strip().split( "," )
 
        for (ga_title, ga_item) in ga_titles:
                if ga_title.find( items[1] ) != -1:
        items = row.strip().split( "," )
 
        for (ga_title, ga_item) in ga_titles:
                if ga_title.find( items[1] ) != -1:

-                       ga_item.append( items[5] )
-                       ga_item.append( items[6] )
+                       ga_item.append( items[2] )
+                       ga_item.append( items[3] )

                        break
        else:
                        break
        else:

-               sys.stderr.write( "! %s - %s\n" % (items[1],items[5]) )
+               sys.stderr.write( "! %s - %s\n" % (items[1],items[2]) )

 
 otp_file.close()
 for (title, item) in ga_titles:
 
 otp_file.close()
 for (title, item) in ga_titles: