Changeset 996

Timestamp:

Dec 28, 2009, 4:57:06 AM (13 years ago)

Author:

Peter Johansson

Message:

refs #279. Added support for anchor_image format in Configuration class and extended test of Configuration.

Location:

trunk

Files:

• lib/Configuration.cc (modified) (4 diffs)
• lib/Configuration.h (modified) (2 diffs)
• test/config_test.cc (modified) (3 diffs)

trunk/lib/Configuration.cc

@@ -122 +122 @@
     return str=="true" || str=="True" || str=="TRUE" ||
       str=="yes" || str=="Yes" || str=="YES";
+  }
+
+
+  const std::string& Configuration::image_anchor_format(void) const
+  {
+    return image_anchor_format_;
   }
 
@@ -294 +300 @@
           }
           image_format_ = rhs;
+        }
+        else if (lhs == "image_format") {
+          if (rhs!="none" && rhs!="png" && rhs!="svg" && rhs!="pdf") {
+            throw Config_error(line, "unknown format: " + rhs);
+          }
+          image_anchor_format_ = rhs;
         }
       }
@@ -438 +450 @@
     dictionary_ = VectorPair(1, std::make_pair("*.in", "$1"));
     image_format_ = "png";
+    image_anchor_format_ = "png";
   }
 
@@ -501 +514 @@
        << "[image]\n"
        << "format = " << conf.image_format() << "\n";
+    os << "anchor_format = " << conf.image_anchor_format() << "\n";
 
 

trunk/lib/Configuration.h

@@ -70 +70 @@
     ///
     const std::map<std::string, Alias>& copyright_alias(void) const;
+
+    /**
+       \return pdf, png, none, or svg
+     */
+    const std::string& image_anchor_format(void) const;
 
     /**
@@ -148 +153 @@
 
     VectorPair dictionary_;
+    std::string image_anchor_format_;
     std::string image_format_;
     std::string trac_root_;

trunk/test/config_test.cc

@@ -28 +28 @@
 namespace svndigest{
   void test_codon(test::Suite&);
+  void test_read_write(test::Suite&);
 }} // end of namespace svndigest and theplu
 
@@ -37 +38 @@
 
   test_codon(suite);
+  test_read_write(suite);
                                                                                 
   if (suite.ok()) {
@@ -67 +69 @@
   }
   
+  void test_read_write(test::Suite& suite)
+  {
+    Configuration& config = Configuration::instance();
+    std::stringstream ss;
+    ss << config;
+    config.load(ss);
+    std::stringstream ss2;
+    ss2 << config;
+    if (ss2.str() != ss.str()) {
+      suite.out() << "error: configuration output not equal\n";
+      suite.out() << "defalt output:\n" << ss.str() << "\n";
+      suite.out() << "second output:\n" << ss2.str() << "\n";
+      suite.add(false);
+    }
+  }
+
 }} // end of namespace svndigest and theplu