Mercurial > hg > orthanc

changeset 1301:5d56cfa49f68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 09 Feb 2015 15:31:29 +0100
parents 919dfb2fb3fe
children 5fe254fb1c93
files OrthancServer/DatabaseWrapper.cpp OrthancServer/DatabaseWrapper.h OrthancServer/IDatabaseWrapper.h
diffstat 3 files changed, 33 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/DatabaseWrapper.cpp	Fri Feb 06 15:30:46 2015 +0100
+++ b/OrthancServer/DatabaseWrapper.cpp	Mon Feb 09 15:31:29 2015 +0100
@@ -423,10 +423,10 @@
 
 
 
-  void DatabaseWrapper::ListAvailableAttachments(std::list<FileContentType>& result,
+  void DatabaseWrapper::ListAvailableAttachments(std::list<FileContentType>& target,
                                                  int64_t id)
   {
-    result.clear();
+    target.clear();
 
     SQLite::Statement s(db_, SQLITE_FROM_HERE, 
                         "SELECT fileType FROM AttachedFiles WHERE id=?");
@@ -434,7 +434,7 @@
 
     while (s.Step())
     {
-      result.push_back(static_cast<FileContentType>(s.ColumnInt(0)));
+      target.push_back(static_cast<FileContentType>(s.ColumnInt(0)));
     }
   }
 
@@ -519,7 +519,7 @@
   }
 
 
-  bool DatabaseWrapper::GetParentPublicId(std::string& result,
+  bool DatabaseWrapper::GetParentPublicId(std::string& target,
                                           int64_t id)
   {
     SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT a.publicId FROM Resources AS a, Resources AS b "
@@ -528,7 +528,7 @@
 
     if (s.Step())
     {
-      result = s.ColumnString(0);
+      target = s.ColumnString(0);
       return true;
     }
     else
@@ -538,34 +538,34 @@
   }
 
 
-  void DatabaseWrapper::GetChildrenPublicId(std::list<std::string>& result,
+  void DatabaseWrapper::GetChildrenPublicId(std::list<std::string>& target,
                                             int64_t id)
   {
     SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT a.publicId FROM Resources AS a, Resources AS b  "
                         "WHERE a.parentId = b.internalId AND b.internalId = ?");     
     s.BindInt64(0, id);
 
-    result.clear();
+    target.clear();
 
     while (s.Step())
     {
-      result.push_back(s.ColumnString(0));
+      target.push_back(s.ColumnString(0));
     }
   }
 
 
-  void DatabaseWrapper::GetChildrenInternalId(std::list<int64_t>& result,
+  void DatabaseWrapper::GetChildrenInternalId(std::list<int64_t>& target,
                                               int64_t id)
   {
     SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT a.internalId FROM Resources AS a, Resources AS b  "
                         "WHERE a.parentId = b.internalId AND b.internalId = ?");     
     s.BindInt64(0, id);
 
-    result.clear();
+    target.clear();
 
     while (s.Step())
     {
-      result.push_back(s.ColumnInt64(0));
+      target.push_back(s.ColumnInt64(0));
     }
   }
 
@@ -944,7 +944,7 @@
   }
 
 
-  void  DatabaseWrapper::LookupIdentifier(std::list<int64_t>& result,
+  void  DatabaseWrapper::LookupIdentifier(std::list<int64_t>& target,
                                           const DicomTag& tag,
                                           const std::string& value)
   {
@@ -960,16 +960,16 @@
     s.BindInt(1, tag.GetElement());
     s.BindString(2, value);
 
-    result.clear();
+    target.clear();
 
     while (s.Step())
     {
-      result.push_back(s.ColumnInt64(0));
+      target.push_back(s.ColumnInt64(0));
     }
   }
 
 
-  void  DatabaseWrapper::LookupIdentifier(std::list<int64_t>& result,
+  void  DatabaseWrapper::LookupIdentifier(std::list<int64_t>& target,
                                           const std::string& value)
   {
     SQLite::Statement s(db_, SQLITE_FROM_HERE, 
@@ -977,19 +977,19 @@
 
     s.BindString(0, value);
 
-    result.clear();
+    target.clear();
 
     while (s.Step())
     {
-      result.push_back(s.ColumnInt64(0));
+      target.push_back(s.ColumnInt64(0));
     }
   }
 
 
-  void DatabaseWrapper::GetAllMetadata(std::map<MetadataType, std::string>& result,
+  void DatabaseWrapper::GetAllMetadata(std::map<MetadataType, std::string>& target,
                                        int64_t id)
   {
-    result.clear();
+    target.clear();
 
     SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT type, value FROM Metadata WHERE id=?");
     s.BindInt64(0, id);
@@ -997,7 +997,7 @@
     while (s.Step())
     {
       MetadataType key = static_cast<MetadataType>(s.ColumnInt(0));
-      result[key] = s.ColumnString(1);
+      target[key] = s.ColumnString(1);
     }
   }
 
--- a/OrthancServer/DatabaseWrapper.h	Fri Feb 06 15:30:46 2015 +0100
+++ b/OrthancServer/DatabaseWrapper.h	Mon Feb 09 15:31:29 2015 +0100
@@ -122,7 +122,7 @@
     virtual void DeleteAttachment(int64_t id,
                                   FileContentType attachment);
 
-    virtual void ListAvailableAttachments(std::list<FileContentType>& result,
+    virtual void ListAvailableAttachments(std::list<FileContentType>& target,
                                           int64_t id);
 
     virtual bool LookupAttachment(FileInfo& attachment,
@@ -136,10 +136,10 @@
     virtual void GetMainDicomTags(DicomMap& map,
                                   int64_t id);
 
-    virtual void GetChildrenPublicId(std::list<std::string>& result,
+    virtual void GetChildrenPublicId(std::list<std::string>& target,
                                      int64_t id);
 
-    virtual void GetChildrenInternalId(std::list<int64_t>& result,
+    virtual void GetChildrenInternalId(std::list<int64_t>& target,
                                        int64_t id);
 
     virtual void LogChange(int64_t internalId,
@@ -202,14 +202,14 @@
 
     virtual bool IsExistingResource(int64_t internalId);
 
-    virtual void LookupIdentifier(std::list<int64_t>& result,
+    virtual void LookupIdentifier(std::list<int64_t>& target,
                                   const DicomTag& tag,
                                   const std::string& value);
 
-    virtual void LookupIdentifier(std::list<int64_t>& result,
+    virtual void LookupIdentifier(std::list<int64_t>& target,
                                   const std::string& value);
 
-    virtual void GetAllMetadata(std::map<MetadataType, std::string>& result,
+    virtual void GetAllMetadata(std::map<MetadataType, std::string>& target,
                                 int64_t id);
 
 
@@ -229,7 +229,7 @@
 
     int64_t GetTableRecordCount(const std::string& table);
     
-    bool GetParentPublicId(std::string& result,
+    bool GetParentPublicId(std::string& target,
                            int64_t id);
 
   };
--- a/OrthancServer/IDatabaseWrapper.h	Fri Feb 06 15:30:46 2015 +0100
+++ b/OrthancServer/IDatabaseWrapper.h	Mon Feb 09 15:31:29 2015 +0100
@@ -73,7 +73,7 @@
 
     virtual void FlushToDisk() = 0;
 
-    virtual void GetAllMetadata(std::map<MetadataType, std::string>& result,
+    virtual void GetAllMetadata(std::map<MetadataType, std::string>& target,
                                 int64_t id) = 0;
 
     virtual void GetAllPublicIds(std::list<std::string>& target,
@@ -85,10 +85,10 @@
                             int64_t since,
                             unsigned int maxResults) = 0;
 
-    virtual void GetChildrenInternalId(std::list<int64_t>& result,
+    virtual void GetChildrenInternalId(std::list<int64_t>& target,
                                        int64_t id) = 0;
 
-    virtual void GetChildrenPublicId(std::list<std::string>& result,
+    virtual void GetChildrenPublicId(std::list<std::string>& target,
                                      int64_t id) = 0;
 
     virtual void GetExportedResources(std::list<ExportedResource>& target /*out*/,
@@ -120,7 +120,7 @@
     virtual void ListAvailableMetadata(std::list<MetadataType>& target,
                                        int64_t id) = 0;
 
-    virtual void ListAvailableAttachments(std::list<FileContentType>& result,
+    virtual void ListAvailableAttachments(std::list<FileContentType>& target,
                                           int64_t id) = 0;
 
     virtual void LogChange(int64_t internalId,
@@ -135,11 +135,11 @@
     virtual bool LookupGlobalProperty(std::string& target,
                                       GlobalProperty property) = 0;
 
-    virtual void LookupIdentifier(std::list<int64_t>& result,
+    virtual void LookupIdentifier(std::list<int64_t>& target,
                                   const DicomTag& tag,
                                   const std::string& value) = 0;
 
-    virtual void LookupIdentifier(std::list<int64_t>& result,
+    virtual void LookupIdentifier(std::list<int64_t>& target,
                                   const std::string& value) = 0;
 
     virtual bool LookupMetadata(std::string& target,