BarraQDA · gdzqzzx · Jul 5, 2021 · Jul 5, 2021 · Jul 5, 2021 · Jul 8, 2021
diff --git a/AdjustDate.py b/AdjustDate.py
diff --git a/CompareDBs.py b/CompareDBs.py
diff --git a/DeleteAllData.py b/DeleteAllData.py
diff --git a/DenormaliseDB.py b/DenormaliseDB.py
diff --git a/DropItemForeignKeys.py b/DropItemForeignKeys.py
diff --git a/NVPX2RQDA.py b/NVPX2RQDA.py
diff --git a/NVivo database structure notes.txt b/NVivo database structure notes.txt
diff --git a/NVivo.py b/NVivo.py
@@ -661,8 +661,10 @@ def Normalise(args):
                     nvivoBlobStorage.c.Object if nvivoBlobStorage is not None else nvivoSource.c.Object,
                     nvivoSource.c.PlainText,
                     nvivoSource.c.MetaData,
-                    nvivoSource.c.ThumbnailLocation if args.nvivoversion == '12' else nvivoSource.c.Thumbnail,
-                    nvivoSource.c.WaveformLocation if args.nvivoversion == '12' else nvivoSource.c.Waveform,
+                    # nvivoSource.c.ThumbnailLocation if args.nvivoversion in '12' else nvivoSource.c.Thumbnail,
+                    nvivoSource.c.Thumbnail,
+                    # nvivoSource.c.WaveformLocation if args.nvivoversion == '12' else nvivoSource.c.Waveform,
+                    nvivoSource.c.Waveform,
                     nvivoItem.c.TypeId.label('SourceType'),
                     nvivoItem.c.CreatedBy,
                     nvivoItem.c.CreatedDate,
@@ -845,7 +847,7 @@ def build_tagging_or_annotation(item):
             if item['StartX'] is not None and item['LengthX'] is not None:
                 item['Fragment'] += str(item['StartX']+1) + ':' + str(item['StartX'] + item['LengthX']);
             if item['StartY'] is not None:
-                item['Fragment'] += ',' + str(item['StartY']+1)
+                item['Fragment'] += ',' + str(item['StartY'])
                 if item['LengthY'] > 0:
                     item['Fragment'] += ':' + str(item['StartY'] + item['LengthY'])
 
@@ -879,7 +881,7 @@ def build_tagging_or_annotation(item):
                     #nvivoNodeReference.c.ReferenceTypeId == literal_column('0'),
                     nvivoItem.c.Id == nvivoNodeReference.c.Node_Item_Id,
                     nvivoItem.c.TypeId == literal_column(NVivo.ItemType.Node),
-                    nvivoNodeReference.c.StartZ.is_(None)
+                    #nvivoNodeReference.c.StartZ.is_(None)
                 )))]
             for tagging in taggings:
                 build_tagging_or_annotation(tagging)
@@ -901,13 +903,13 @@ def build_tagging_or_annotation(item):
                     nvivoAnnotation.c.CreatedDate,
                     nvivoAnnotation.c.ModifiedBy,
                     nvivoAnnotation.c.ModifiedDate
-                ] + [
+                ] + ([
                     nvivoAnnotation.c.StartText,
                     nvivoAnnotation.c.LengthText
                 ] if args.mac else [
                     nvivoAnnotation.c.StartX,
                     nvivoAnnotation.c.LengthX
-                ]))]
+                ])))]
 
             for annotation in annotations:
                 annotation['Node'] = None

diff --git a/NVivo2RQDADB.py b/NVivo2RQDADB.py
diff --git a/Norm2RQDA.py b/Norm2RQDA.py
diff --git a/NormaliseDB.py b/NormaliseDB.py
diff --git a/NormaliseNVP.py b/NormaliseNVP.py
@@ -31,15 +31,17 @@ def NormaliseNVP(arglist):
 
     parser.add_argument('-v', '--verbosity', type=int, default=1)
 
-    parser.add_argument('-nv', '--nvivoversion', choices=["10", "11"], default="10",
-                        help='NVivo version (10 or 11)')
+    parser.add_argument('-nv', '--nvivoversion', choices=["10", "11", "12"], default="10",
+                        help='NVivo version (10 or 11 or 12)')
 
     parser.add_argument('-S', '--server', type=str,
                         help="IP address/name of Microsoft SQL Server")
     parser.add_argument('-P', '--port', type=int,
                         help="Port of Microsoft SQL Server")
     parser.add_argument('-i', '--instance', type=str,
                         help="Microsoft SQL Server instance")
+    parser.add_argument('-d', '--drop', choices=["keep", "drop"], default="drop",
+                        help='Drop attached NVivo SQL Server Database')
 
     parser.add_argument('-u', '--users', choices=["skip", "merge", "overwrite", "replace"], default="merge",
                         help='User action.')
@@ -98,7 +100,7 @@ def executecommand(command):
             instanceversion = regquerydata[2].split('.')[0]
             if args.verbosity >= 2:
                 print("Found SQL server instance " + instancename + "  version " + instanceversion, file=sys.stderr)
-            if (args.nvivoversion == '10' and instanceversion == 'MSSQL10_50') or (args.nvivoversion == '11' and instanceversion == 'MSSQL12'):
+            if (args.nvivoversion == '10' and instanceversion == 'MSSQL10_50') or (args.nvivoversion == '11' and instanceversion == 'MSSQL12') or (args.nvivoversion == '12' and instanceversion == 'MSSQL14'):
                 args.instance = instancename
                 break
         else:
@@ -114,14 +116,20 @@ def executecommand(command):
     if args.verbosity > 0:
         print("Using port: " + str(args.port), file=sys.stderr)
 
+    if args.nvivoversion == '11':
+        version = 'MSSQL12'
+    elif args.nvivoversion == '12':
+        version = 'MSSQL14'
+    else:
+        version = 'MSQL10_50'
     mssqlapi = mssqlAPI(args.server,
                         args.port,
                         args.instance,
-                        version = ('MSSQL12' if args.nvivoversion == '11' else 'MSSQL10_50'),
+                        version = version,
                         verbosity = args.verbosity)
 
     # Get reasonably distinct yet recognisable DB name
-    dbname = 'nvivo' + str(os.getpid())
+    dbname = 'nvivo' + str(os.getpid()) + '_' + args.infile.rsplit('\\', 1)[-1].rsplit('/', 1)[-1].rsplit('.', 1)[0].strip()
 
     mssqlapi.attach(args.infile, dbname)
     try:
@@ -136,7 +144,11 @@ def executecommand(command):
         raise
 
     finally:
-        mssqlapi.drop(dbname)
+        if args.drop == 'drop':
+            mssqlapi.drop(dbname)
+            print(f"Drop database {dbname}")
+        else:
+            print(f"Keep database {dbname}")
 
 if __name__ == '__main__':
     NormaliseNVP(None)
diff --git a/NormaliseNVPX.py b/NormaliseNVPX.py
diff --git a/NormaliseOpenQDA.py b/NormaliseOpenQDA.py
diff --git a/RQDA2NVPX.py b/RQDA2NVPX.py
diff --git a/RQDA2NVivoDB.py b/RQDA2NVivoDB.py
diff --git a/RQDA2Norm.py b/RQDA2Norm.py
diff --git a/Subtract.py b/Subtract.py
diff --git a/Translate.py b/Translate.py
diff --git a/editNode.py b/editNode.py
diff --git a/editNodeAttribute.py b/editNodeAttribute.py
diff --git a/editNodeCategory.py b/editNodeCategory.py
diff --git a/editProject.py b/editProject.py
diff --git a/editSource.py b/editSource.py
diff --git a/editSourceAttribute.py b/editSourceAttribute.py
diff --git a/editSourceCategory.py b/editSourceCategory.py
diff --git a/editTagging.py b/editTagging.py
diff --git a/editUser.py b/editUser.py
diff --git a/extractTagging.py b/extractTagging.py
diff --git a/helpers/mssqlAttach.bat b/helpers/mssqlAttach.bat
diff --git a/helpers/mssqlCreate.bat b/helpers/mssqlCreate.bat
diff --git a/helpers/mssqlSave.bat b/helpers/mssqlSave.bat
diff --git a/helpers/sqlanyenv.sh b/helpers/sqlanyenv.sh
diff --git a/helpers/sqlanysrv.sh b/helpers/sqlanysrv.sh
diff --git a/helpers/unoconv b/helpers/unoconv
diff --git a/mssqlAttach.py b/mssqlAttach.py
diff --git a/mssqlCreate.py b/mssqlCreate.py
diff --git a/mssqlDrop.py b/mssqlDrop.py
diff --git a/mssqlList.py b/mssqlList.py
diff --git a/mssqlSave.py b/mssqlSave.py
diff --git a/nvpn2bqda.py b/nvpn2bqda.py
diff --git a/nvpn2nvp.py b/nvpn2nvp.py
diff --git a/nvpn2nvpx.py b/nvpn2nvpx.py
diff --git a/querySource.py b/querySource.py
diff --git a/queryTagging.py b/queryTagging.py
diff --git a/regressionTest.sh b/regressionTest.sh
diff --git a/saveSources.py b/saveSources.py
diff --git a/tagNounPhrases.py b/tagNounPhrases.py
diff --git a/tagSpeakers.py b/tagSpeakers.py