Merge pull request #4 from MattSlm:project-schema

.gitignore

@@ -1,3 +1,4 @@
+build
 *.info
 *.pyc
 *.rpm

src/db/generic/Pair.h

@@ -27,23 +27,29 @@
 #include "common/Uri.h"
 
 struct Pair {
-    std::string source, destination;
+    std::string source, destination, vo;
 
-    Pair(const std::string &s, const std::string &d): source(s), destination(d) {
+    Pair(const std::string &s, const std::string &d): source(s), destination(d), vo("") {
+    }
+
+    Pair(const std::string &s, const std::string &d, const std::string &v): source(s), destination(d), vo(v) {
     }
 
     bool isLanTransfer() const {
         return fts3::common::isLanTransfer(source, destination);
     }
 };
 
+// FIXME: So far, assume each (source, destination) pair only has one vo first.
+// Support multiple vo later.
+
 // Required so it can be used as a key on a std::map
 inline bool operator < (const Pair &a, const Pair &b) {
     return a.source < b.source || (a.source == b.source && a.destination < b.destination);
 }
 
 inline bool operator == (const Pair &a, const Pair &b) {
-  return a.source == b.source && a.destination == b.destination;
+    return a.source == b.source && a.destination == b.destination;
 }
 
 inline std::ostream& operator << (std::ostream &os, const Pair &pair) {

src/db/generic/ThrInfo.h

@@ -27,11 +27,10 @@
 #include "common/Uri.h"
 
 struct TransferredStat {
-    int64_t transferred, limit;
+    int64_t transferred;
+    double limit;
 
-    TransferredStat(const int64_t &t, const int64_t &l): 
-                transferred(t), limit(l)
-    {
+    TransferredStat(const int64_t &t, const double &l): transferred(t), limit(l) {
     }
 };