Changeset 1039

Timestamp:

31.05.2010 22:02:19 (20 months ago)

Author:

zmsdev

Message:

Revised str_json and str_item

File:

• ZMS/trunk/ZMSGlobals.py (modified) (6 diffs)

ZMS/trunk/ZMSGlobals.py

@@ -1027 +1027 @@
         except:
           pass
-      elif type(i) is str:
-        return '\'%s\''%(str(i).replace('\'','\\\''))
-      elif i is not None:
+      elif type(i) is int or type(i) is float:
         return str(i)
+      else:
+        return '\'%s\''%(str(i).replace('\'','\\\'').replace('\n','\\n').replace('\r','\\r'))
       return '\'\''
 
@@ -1037 +1037 @@
     # --------------------------------------------------------------------------
     def str_item(self, i):
-      if type(i) is list:
-        return ''.join(map(lambda x: self.str_item(x)+'\n',i))
+      if type(i) is list or type(i) is tuple:
+        return '\n'.join(map(lambda x: self.str_item(x),i))
       elif type(i) is dict:
-        return ''.join(map(lambda x: self.str_item(i[x])+'\n',i.keys()))
-      elif type(i) is tuple or type(i) is time.struct_time:
+        return '\n'.join(map(lambda x: self.str_item(i[x]),i.keys()))
+      elif type(i) is time.struct_time:
         try:
-          i = self.getLangFmtDate(i)
+          return self.getLangFmtDate(i)
         except:
           pass
-      elif i is not None:
+      if i is not None:
         return str(i)
       else:
@@ -1356 +1356 @@
       except:
         pass
-      _globals.writeBlock( self, '[localfs_read]: filename=%s'%filename)
+      if _globals.debug( self):
+        _globals.writeLog( self, '[localfs_read]: filename=%s'%filename)
       # Check permissions.
       access = False
@@ -1386 +1387 @@
       Writes file to local file-system.
       """
-      _globals.writeBlock( self, '[localfs_write]: filename=%s'%filename)
+      if _globals.debug( self):
+        _globals.writeLog( self, '[localfs_write]: filename=%s'%filename)
       _fileutil.exportObj( v, filename, mode)
 
@@ -1397 +1399 @@
       Removes file from local file-system.
       """
-      _globals.writeBlock( self, '[localfs_remove]: path=%s'%path)
+      if _globals.debug( self):
+        _globals.writeLog( self, '[localfs_remove]: path=%s'%path)
       _fileutil.remove( path, deep)
 
@@ -1413 +1416 @@
       except:
         pass
-      _globals.writeBlock( self, '[localfs_readPath]: filename=%s'%filename)
+      if _globals.debug( self):
+        _globals.writeLog( self, '[localfs_readPath]: filename=%s'%filename)
       return _fileutil.readPath(filename, data, recursive)