Changeset 103

Timestamp:

09/26/07 09:37:32 (11 months ago)

Author:

andrew

Message:

First working version - mateTiff is very fragile. It has to use a seprate java application to add xml back into tiff.

Location:

Xml/Validator/Backend

Files:

• isValidOME.py (added)
• mateTiff.py (modified) (3 diffs)

Xml/Validator/Backend/mateTiff.py

@@ -15 +15 @@
 help_message = '''
 This extracts the Description block [270] from the TIFF file and opens it 
-in the mate editor
+in the mate editor then writes it back
 '''
 
@@ -59 +59 @@
                                     # read the xml from the tiff
                                         theXml = image.tag[270]
-                                        # print "Processing file : %s\n" % aFilename
-                                        # print theXml
-                                        # print ""
                                         theNewXml = edited_text(theXml)
-                                        image.tag[270] = theNewXml
-                                        print "At present this destroys multi plane TIFF files - are you sure you want to save? y/n"
-                                        confirm = sys.stdin.readline()[:-1]
-                                        print 'confirm = \'%s\'' %(confirm)
-                                        if confirm in ['y', 'Y', 'Yes', 'YES', 'yes']:
-                                                print "Saving..."
-                                                image.save(aFilename)
-                                                print "done"
-                                        else:
-                                                print "Skipped"
-                
+                                        write_tag_into_tiff(aFilename, theNewXml)
                 
         except Usage, err:
@@ -103 +90 @@
         os.unlink(temp_filename)
         return result
+
+def write_tag_into_tiff(inTiffFilename, inXmlString):
+        temp_fd, temp_filename = tempfile.mkstemp(text=True)
+        os.write(temp_fd, inXmlString)
+        os.close(temp_fd)
+        x = os.spawnlp(os.P_WAIT, "java", "java", "EditTiff", inTiffFilename, temp_filename)
+        if x:
+                raise RuntimeError, "Can't run java EditTiff %s %s (%s)" % (inTiffFilename, temp_filename,x)
+        result = open(temp_filename).read()
+        os.unlink(temp_filename)
+        return result
         
 if __name__ == "__main__":