Author: thijs
Date: 2008-07-25 15:46:51 +0000 (Fri, 25 Jul 2008)
New Revision: 2309
Added:
trunk/packages/ctn/trunk/debian/patches/20_mysql_4.2.patch
Modified:
trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch
trunk/packages/ctn/trunk/debian/patches/series
Log:
actually, the 4.2+ patch had gone completely missing. add it.
Modified: trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch
2008-07-25 15:25:59 UTC (rev 2308)
+++ trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch
2008-07-25 15:46:51 UTC (rev 2309)
@@ -1,8 +1,3 @@
-# This patch was provided by Pablo Sau <[EMAIL PROTECTED]>
-# on Wed, 28 May 2008 19:38:32 +0200
-# to make the ctn working properly with the mysql server > 4.2.
-# Thanks to Pablo ...
-
--- ctn-3.0.6.orig/apps/dcm_modify_object/gram.h
+++ ctn-3.0.6/apps/dcm_modify_object/gram.h
@@ -1,22 +1,73 @@
Added: trunk/packages/ctn/trunk/debian/patches/20_mysql_4.2.patch
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/20_mysql_4.2.patch
(rev 0)
+++ trunk/packages/ctn/trunk/debian/patches/20_mysql_4.2.patch 2008-07-25
15:46:51 UTC (rev 2309)
@@ -0,0 +1,94 @@
+# This patch was provided by Pablo Sau <[EMAIL PROTECTED]>
+# on Wed, 28 May 2008 19:38:32 +0200
+# to make the ctn working properly with the mysql server > 4.2.
+# Thanks to Pablo ...
+
+--- ctn-3.0.6.orig/cfg_scripts/mysql/CreateDIMTables.script
++++ ctn-3.0.6/cfg_scripts/mysql/CreateDIMTables.script
+@@ -49,7 +49,7 @@
+ \g
+ CREATE TABLE SeriesLevel
+ (
+- Mod char(16) not null,
++ Modality char(16) not null,
+ SerNum char(12) not null,
+ SerInsUID char(64) not null,
+ ProNam char(64),
+--- ctn-3.0.6.orig/cfg_scripts/mysql/CreateFISTables.script
++++ ctn-3.0.6/cfg_scripts/mysql/CreateFISTables.script
+@@ -62,7 +62,7 @@
+ CREATE TABLE StudyCmpTable (
+ StuComUID char(64) not null,
+ StuInsUID char(64) not null,
+- Mod char(16) not null,
++ Modality char(16) not null,
+ ProCodVal char(16),
+ ProCodSchDes char(16),
+ ProCodMea char(64),
+--- ctn-3.0.6.orig/cfg_scripts/mysql/FillDIMTables.script
++++ ctn-3.0.6/cfg_scripts/mysql/FillDIMTables.script
+@@ -140,7 +140,7 @@
+ 'P0001')
+ \g
+ INSERT INTO SeriesLevel(
+- Mod,
++ Modality,
+ SerNum,
+ SerInsUID,
+ ProNam,
+@@ -169,7 +169,7 @@
+ 'STUDY1.1')
+ \g
+ INSERT INTO SeriesLevel(
+- Mod,
++ Modality,
+ SerNum,
+ SerInsUID,
+ ProNam,
+@@ -198,7 +198,7 @@
+ 'STUDY1.2')
+ \g
+ INSERT INTO SeriesLevel(
+- Mod,
++ Modality,
+ SerNum,
+ SerInsUID,
+ ProNam,
+--- ctn-3.0.6.orig/facilities/idb/idb.c
++++ ctn-3.0.6/facilities/idb/idb.c
+@@ -319,7 +319,7 @@
+ static TBL_FIELD
+ GS_SERSEL_Field[] =
+ {
+- "Mod", TBL_STRING, DICOM_CS_LENGTH + 1, DICOM_CS_LENGTH + 1, 0,
GS_SERSEL_Mod,
++ "Modality", TBL_STRING, DICOM_CS_LENGTH + 1, DICOM_CS_LENGTH + 1, 0,
GS_SERSEL_Mod,
+ "SerNum", TBL_STRING, DICOM_IS_LENGTH + 1, DICOM_IS_LENGTH + 1, 0,
GS_SERSEL_SerNum,
+ "SerInsUID", TBL_STRING, DICOM_UI_LENGTH + 1, DICOM_UI_LENGTH + 1, 0,
GS_SERSEL_SerInsUID,
+ "ProNam", TBL_STRING, DICOM_LO_LENGTH + 1, DICOM_LO_LENGTH + 1, 0,
GS_SERSEL_ProNam,
+@@ -3541,7 +3541,7 @@
+ i = GS_NumSerNodes - 1;
+ GS_NullSerFlag[i] = 0;
+ while (fp->FieldName != 0) {
+- if (strcmp(fp->FieldName, "Mod") == 0) {
++ if (strcmp(fp->FieldName, "Modality") == 0) {
+ if (fp->Value.IsNull)
+ GS_NullSerFlag[i] |= QF_SER_Mod;
+ else
+@@ -4682,7 +4682,7 @@
+ return (0);
+ }
+ op = likeOrEqualOperator(pssi->series.Mod);
+- TBL_CRITERIA_LOAD_BYTE(GS_sercl[i], "Mod", cs, TBL_STRING, op);
++ TBL_CRITERIA_LOAD_BYTE(GS_sercl[i], "Modality", cs, TBL_STRING,
op);
+ i++;
+ }
+ }
+@@ -5433,7 +5433,7 @@
+ } else { /* Need Series Insertion */
+
+ i = 0;
+- TBL_FIELD_LOAD_BYTE(serfld[i], "Mod", pssi->series.Mod, TBL_STRING);
++ TBL_FIELD_LOAD_BYTE(serfld[i], "Modality", pssi->series.Mod,
TBL_STRING);
+ i++;
+ TBL_FIELD_LOAD_BYTE(serfld[i], "SerNum", pssi->series.SerNum,
TBL_STRING);
+ i++;
Modified: trunk/packages/ctn/trunk/debian/patches/series
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/series 2008-07-25 15:25:59 UTC
(rev 2308)
+++ trunk/packages/ctn/trunk/debian/patches/series 2008-07-25 15:46:51 UTC
(rev 2309)
@@ -1 +1,2 @@
10_all_patches.patch
+20_mysql_4.2.patch
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
