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_s = match_o1.group(2)
+ imgname_s = match_o2.group(2)
geom = self._get_png_geom(imgname_s)
if geom:
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-import os, sys
+import os
+import sys
import codecs
sys.stdout = codecs.getwriter('utf_8')(sys.stdout)
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:
- ga_item.append( items[5] )
- ga_item.append( items[6] )
+ ga_item.append( items[2] )
+ ga_item.append( items[3] )
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: