Merge branch 'master' into fpsave

docs/README

@@ -39,8 +39,8 @@ The fingerprint can be used for historical comparisons to see what has changed i
 
 usage: dbfp.py [-h] [-db DATABASE] [-fd FPDIR] [-fp FINGERPRINT]
                [-ad ANDROID_DIR] [-dd DATA_DIR] [-idx INDEX_FINGERPRINTS]
-               [-an APP_NAME] [-av APP_VERSION] [-n NOTES] [-android_pull]
-               [-v] [-vv] [-l]
+               [-md5 MD5] [-an APP_NAME] [-av APP_VERSION] [-n NOTES] [-idxf]
+               [-android_pull] [-v] [-vv] [-l]
 
 Fingerprint a sqlite database based on its schema
 
@@ -59,13 +59,14 @@ optional arguments:
                         path to a directory to search for sqlite files
   -idx INDEX_FINGERPRINTS, --index_fingerprints INDEX_FINGERPRINTS
                         path to a directory with sqlite files
+  -md5 MD5              md5 hash to query the index`
   -an APP_NAME, --app_name APP_NAME
   -av APP_VERSION, --app_version APP_VERSION
   -n NOTES, --notes NOTES
+  -idxf                 add a fingerprint to the index
   -android_pull         automated pull of applications from a physical android
                         phone
   -v, --verbose         will set logging level to INFO
   -vv, --vverbose       will set logging level to DEBUG
   -l, --logging         will supercede the -v option and send all logging to a
                         file, logging.DEBUG
-

docs/RELEASE_NOTES

@@ -9,6 +9,14 @@
   History
 ------------
 
+version 0.98
+  -new feature: query for md5 hash
+    -command switch "-md5 <hash_string>"
+  -new feature: add fingerprint to index
+    -command switch "-idxf"
+  -modified commandline parameters
+  -bug fixes
+
 version 0.97
   -add more verbose output options to command line interface
     "-v" is logging level INFO

libs/fingerprint.py

@@ -35,7 +35,7 @@ class FingerprintDB:
 
   sqlmaster = "SELECT name, sql FROM sqlite_master WHERE type='table'"
   # version of the scanner used to create the fingerprint
-  scanner_ver = "0.96"
+  scanner_ver = "0.98"
   # version of the json file format, this # is inserted in the json fingerprint file and can be used to determine what is supported at the time of that version
   format_ver  = "0.91"