[med-svn] r12639 - in trunk/packages/orthanc/trunk/debian: . configuration docs patches

Sebastien Jodogne jodogne-guest at alioth.debian.org
Mon Dec 17 09:45:20 UTC 2012 

Author: jodogne-guest
Date: 2012-12-17 09:45:19 +0000 (Mon, 17 Dec 2012)
New Revision: 12639

Added:
   trunk/packages/orthanc/trunk/debian/patches/
   trunk/packages/orthanc/trunk/debian/patches/embedding-dictionaries
   trunk/packages/orthanc/trunk/debian/patches/jsoncpp
   trunk/packages/orthanc/trunk/debian/patches/series
Modified:
   trunk/packages/orthanc/trunk/debian/changelog
   trunk/packages/orthanc/trunk/debian/configuration/orthanc.json
   trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
   trunk/packages/orthanc/trunk/debian/rules
Log:
orthanc 0.4.0

Modified: trunk/packages/orthanc/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc/trunk/debian/changelog	2012-12-17 08:54:24 UTC (rev 12638)
+++ trunk/packages/orthanc/trunk/debian/changelog	2012-12-17 09:45:19 UTC (rev 12639)
@@ -1,3 +1,9 @@
+orthanc (0.4.0-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Mon, 17 Dec 2012 09:35:27 +0100
+
 orthanc (0.2.3-1) unstable; urgency=low
 
   * New upstream version.

Modified: trunk/packages/orthanc/trunk/debian/configuration/orthanc.json
===================================================================
--- trunk/packages/orthanc/trunk/debian/configuration/orthanc.json	2012-12-17 08:54:24 UTC (rev 12638)
+++ trunk/packages/orthanc/trunk/debian/configuration/orthanc.json	2012-12-17 09:45:19 UTC (rev 12639)
@@ -3,15 +3,26 @@
      * General configuration of Orthanc
      **/
 
-    // Path to the directory that holds the database
-    "StorageDirectory" : "/var/lib/orthanc/0.2.3",
-
     // The logical name of this instance of Orthanc. This one is
     // displayed in Orthanc Explorer and at the URI "/system".
     "Name" : "Orthanc",
 
+    // Path to the directory that holds the database
+    "StorageDirectory" : "/var/lib/orthanc/db-v3",
 
+    // Enable the transparent compression of the DICOM instances
+    "StorageCompression" : false,
 
+    // Maximum size of the storage in MB (a value of "0" indicates no
+    // limit on the storage size)
+    "MaximumStorageSize" : 0,
+
+    // Maximum number of patients that can be stored at a given time
+    // in the storage (a value of "0" indicates no limit on the number
+    // of patients)
+    "MaximumPatientCount" : 0,
+
+
     /**
      * Configuration of the HTTP server
      **/
@@ -66,7 +77,13 @@
 
     // The list of the known DICOM modalities
     "DicomModalities" : {
-        // "sample" : [ "SAMPLESCP", "192.168.100.42", 104 ]
+      /**
+       * Uncommenting the following line would enable Orthanc to
+       * connect to an instance of the "storescp" open-source DICOM
+       * store (shipped in the DCMTK distribution) started by the
+       * command line "storescp 2000".
+       **/
+      // "sample" : [ "STORESCP", "localhost", 2000 ]
     },
 
     // The list of the known Orthanc peers (currently unused)

Modified: trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
===================================================================
--- trunk/packages/orthanc/trunk/debian/docs/Orthanc.1	2012-12-17 08:54:24 UTC (rev 12638)
+++ trunk/packages/orthanc/trunk/debian/docs/Orthanc.1	2012-12-17 09:45:19 UTC (rev 12639)
@@ -1,33 +1,37 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
-.TH ORTHANC "1" "October 2012" "Orthanc 0.2.3" "User Commands"
+.TH ORTHANC "1" "December 2012" "Orthanc 0.4.0" "User Commands"
 .SH NAME
 Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical research
 .SH SYNOPSIS
 .B Orthanc
 [\fIOPTION\fR]... [\fICONFIGURATION\fR]
 .SH DESCRIPTION
-Start Orthanc, a lightweight, RESTful DICOM server for healthcare and medical research.
+Orthanc, lightweight, RESTful DICOM server for healthcare and medical research.
 .PP
-If no configuration file is given on the command line, a set of default parameters
-is used. Please refer to the Orthanc homepage for the full instructions about how to use Orthanc
+If no configuration file is given on the command line, a set of default
+parameters is used. Please refer to the Orthanc homepage for the full
+instructions about how to use Orthanc
 <https://code.google.com/p/orthanc/wiki/OrthancCookbook>.
 .SS "Command-line options:"
 .TP
-\fB\-\-verbose\fR
-be verbose in logs
+\fB\-\-help\fR
+display this help and exit
 .TP
+\fB\-\-logdir\fR=\fI[dir]\fR
+directory where to store the log files
+(if not used, the logs are dumped to stderr)
+.TP
+\fB\-\-config\fR=\fI[file]\fR
+create a sample configuration file and exit
+.TP
 \fB\-\-trace\fR
 highest verbosity in logs (for debug)
 .TP
-\fB\-\-help\fR
-display this help and exit
+\fB\-\-verbose\fR
+be verbose in logs
 .TP
 \fB\-\-version\fR
 output version information and exit
-.TP
-\fB\-\-logdir\fR=\fI[dir]\fR
-directory where to store the log files
-(if not used, the logs are dumped to stderr)
 .SS "Exit status:"
 .TP
 0

Added: trunk/packages/orthanc/trunk/debian/patches/embedding-dictionaries
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/embedding-dictionaries	                        (rev 0)
+++ trunk/packages/orthanc/trunk/debian/patches/embedding-dictionaries	2012-12-17 09:45:19 UTC (rev 12639)
@@ -0,0 +1,21 @@
+Index: Orthanc-0.4.0/OrthancServer/DicomProtocol/DicomServer.cpp
+===================================================================
+--- Orthanc-0.4.0.orig/OrthancServer/DicomProtocol/DicomServer.cpp	2012-12-14 15:36:05.000000000 +0100
++++ Orthanc-0.4.0/OrthancServer/DicomProtocol/DicomServer.cpp	2012-12-17 10:13:45.728404365 +0100
+@@ -76,16 +76,6 @@
+     /* Disable "gethostbyaddr" (which results in memory leaks) and use raw IP addresses */
+     dcmDisableGethostbyaddr.set(OFTrue);
+ 
+-#if ORTHANC_STANDALONE == 1
+-    LOG(WARNING) << "Loading the embedded dictionaries";
+-    dcmDataDict.clear();
+-    DcmDataDictionary& d = dcmDataDict.wrlock();
+-    LoadEmbeddedDictionary(d, EmbeddedResources::DICTIONARY_DICOM);
+-    LoadEmbeddedDictionary(d, EmbeddedResources::DICTIONARY_PRIVATE);
+-    LoadEmbeddedDictionary(d, EmbeddedResources::DICTIONARY_DICONDE);
+-    dcmDataDict.unlock();
+-#endif
+-
+     /* make sure data dictionary is loaded */
+     if (!dcmDataDict.isDictionaryLoaded())
+     {

Added: trunk/packages/orthanc/trunk/debian/patches/jsoncpp
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/jsoncpp	                        (rev 0)
+++ trunk/packages/orthanc/trunk/debian/patches/jsoncpp	2012-12-17 09:45:19 UTC (rev 12639)
@@ -0,0 +1,31 @@
+Index: Orthanc-0.4.0/OrthancServer/OrthancRestApi.cpp
+===================================================================
+--- Orthanc-0.4.0.orig/OrthancServer/OrthancRestApi.cpp	2012-12-14 15:36:05.000000000 +0100
++++ Orthanc-0.4.0/OrthancServer/OrthancRestApi.cpp	2012-12-17 10:22:20.263084179 +0100
+@@ -466,7 +466,7 @@
+     switch (resourceType)
+     {
+       case ResourceType_Patient:
+-        for (size_t i = 0; i < resource["Studies"].size(); i++)
++        for (Json::Value::ArrayIndex i = 0; i < resource["Studies"].size(); i++)
+         {
+           std::string studyId = resource["Studies"][i].asString();
+           if (!ArchiveInternal(writer, context, studyId, ResourceType_Study, false))
+@@ -477,7 +477,7 @@
+         break;
+ 
+       case ResourceType_Study:
+-        for (size_t i = 0; i < resource["Series"].size(); i++)
++        for (Json::Value::ArrayIndex i = 0; i < resource["Series"].size(); i++)
+         {
+           std::string seriesId = resource["Series"][i].asString();
+           if (!ArchiveInternal(writer, context, seriesId, ResourceType_Series, false))
+@@ -488,7 +488,7 @@
+         break;
+ 
+       case ResourceType_Series:
+-        for (size_t i = 0; i < resource["Instances"].size(); i++)
++        for (Json::Value::ArrayIndex i = 0; i < resource["Instances"].size(); i++)
+         {
+           if (!ArchiveInstance(writer, context, resource["Instances"][i].asString()))
+           {

Added: trunk/packages/orthanc/trunk/debian/patches/series
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/orthanc/trunk/debian/patches/series	2012-12-17 09:45:19 UTC (rev 12639)
@@ -0,0 +1,2 @@
+jsoncpp
+embedding-dictionaries

Modified: trunk/packages/orthanc/trunk/debian/rules
===================================================================
--- trunk/packages/orthanc/trunk/debian/rules	2012-12-17 08:54:24 UTC (rev 12638)
+++ trunk/packages/orthanc/trunk/debian/rules	2012-12-17 09:45:19 UTC (rev 12639)
@@ -7,7 +7,7 @@
 	# Put 3rd party packages where the cmake build system expects them
 	mkdir -p ThirdPartyDownloads
 	( cd ThirdPartyDownloads; cp ../debian/ThirdPartyDownloads/* . )
-	dh_auto_configure -- -DSTATIC_BUILD:BOOL=OFF -DSTANDALONE_BUILD:BOOL=ON -DUSE_DYNAMIC_JSONCPP:BOOL=ON -DDEBIAN_USE_GTEST_SOURCE_PACKAGE:BOOL=ON -DCMAKE_BUILD_TYPE=Release
+	dh_auto_configure -- -DSTATIC_BUILD:BOOL=OFF -DSTANDALONE_BUILD:BOOL=ON -DUSE_DYNAMIC_JSONCPP:BOOL=ON -DDEBIAN_USE_GTEST_SOURCE_PACKAGE:BOOL=ON -DCMAKE_BUILD_TYPE=Release "-DDCMTK_LIBRARIES=wrap;oflog"
 
 override_dh_auto_test:
 	( cd $(CURDIR)/Build; ./UnitTests )

More information about the debian-med-commit mailing list