From 144dc616219e088680c267ae6a0463364b33c41d Mon Sep 17 00:00:00 2001
From: Earl Ou <shunhsingou@google.com>
Date: Wed, 17 Oct 2012 13:59:15 +0800
Subject: Do not use parentheses for Model tag in exiftool parser

Change-Id: Idc45cd389976f0c474dceb550790a6814cb380b8
---
 tests/exiftool_parser/parser.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'tests/exiftool_parser')

diff --git a/tests/exiftool_parser/parser.py b/tests/exiftool_parser/parser.py
index 351c1b63c..5de54a352 100755
--- a/tests/exiftool_parser/parser.py
+++ b/tests/exiftool_parser/parser.py
@@ -63,23 +63,22 @@ for s in tags:
                 ifds.pop()
         layer = new_layer
 
+        # find the ID
+        _id = re.search("0x[0-9a-f]{4}", s)
+        _id = _id.group(0)
+
+        # find the name
+        name = re.search("[0-9]*?\).*? = ", s)
+        name = name.group(0)[4:-3]
+
         # find the raw value in the parenthesis
         value = re.search("\(.*\)\n", s)
-        if value:
+        if (name != 'Model' and value):
             value = value.group(0)[1:-2]
         else:
             value = re.search("=.*\n", s)
             value = value.group(0)[2:-1]
 
-        # find the ID
-        p = re.compile("0x[0-9a-f]{4}")
-        _id = p.search(s)
-        _id = _id.group(0)
-
-        # find the name
-        p = re.compile("[0-9]*?\).*? = ")
-        name = p.search(s)
-        name = name.group(0)[4:-3]
         print ('    <tag ifd="' + ifds[-1] + '" id="'
             + _id + '" name="' + name +'">' + value + "</tag>")
 print "</exif>"
-- 
cgit v1.2.3