[Lemon-commits] [lemon_svn] deba: r2611 - hugo/trunk/lemon

[Lemon SVN]

Author: deba
Date: Tue Mar  7 12:06:57 2006
New Revision: 2611

Modified:
   hugo/trunk/lemon/lemon_reader.h

Log:
Removing obsolote "id" map handling
Error message is modified



Modified: hugo/trunk/lemon/lemon_reader.h
==============================================================================
--- hugo/trunk/lemon/lemon_reader.h	(original)
+++ hugo/trunk/lemon/lemon_reader.h	Tue Mar  7 12:06:57 2006
@@ -895,7 +895,7 @@
 	} else {
 	  index.push_back(&skipper);
 	}
-	if (id == "label" || (id =="id" && inverter.get() == 0)) {
+	if (id == "label") {
 	  inverter.reset(index.back()->getInverter());
 	  index.back() = inverter.get();
 	}
@@ -920,7 +920,7 @@
     virtual void missing() {
       if (readers.empty()) return;
       ErrorMessage msg;
-      msg << "NodeSet section not found in file: " << name;
+      msg << "NodeSet section not found in file: @nodeset " << name;
       throw IOParameterError(msg.message());
     }
 
@@ -1128,7 +1128,7 @@
 	} else {
 	  index.push_back(&skipper);
 	}
-	if (id == "label" || (id =="id" && inverter.get() == 0)) {
+	if (id == "label") {
 	  inverter.reset(index.back()->getInverter());
 	  index.back() = inverter.get();
 	}
@@ -1155,7 +1155,7 @@
     virtual void missing() {
       if (readers.empty()) return;
       ErrorMessage msg;
-      msg << "EdgeSet section not found in file: " << name;
+      msg << "EdgeSet section not found in file: @edgeset " << name;
       throw IOParameterError(msg.message());
     }
 
@@ -1179,7 +1179,9 @@
 
   private:
 
-    typedef std::map<std::string, _reader_bits::MapReaderBase<Edge>*> MapReaders;
+    typedef std::map<std::string, _reader_bits::MapReaderBase<Edge>*> 
+    MapReaders;
+    
     MapReaders readers;
    
     Graph& graph;   
@@ -1213,8 +1215,8 @@
   /// give back that uicted edge which is mapped to this value.
   ///
   /// The undirected edgeset reader needs a node id reader to identify which 
-  /// nodes have to be connected. If a NodeSetReader reads an "label" named map,
-  /// it will be able to resolve the nodes by ids.
+  /// nodes have to be connected. If a NodeSetReader reads an "label" named 
+  /// map, it will be able to resolve the nodes by ids.
   ///
   /// \relates LemonReader
   template <typename _Graph, typename _Traits = DefaultReaderTraits>
@@ -1431,7 +1433,7 @@
 	} else {
 	  index.push_back(&skipper);
 	}
-	if (id == "label" || (id =="id" && inverter.get() == 0)) {
+	if (id == "label") {
 	  inverter.reset(index.back()->getInverter());
 	  index.back() = inverter.get();
 	}
@@ -1458,7 +1460,7 @@
     virtual void missing() {
       if (readers.empty()) return;
       ErrorMessage msg;
-      msg << "UEdgeSet section not found in file: " << name;
+      msg << "UEdgeSet section not found in file: @uedgeset " << name;
       throw IOParameterError(msg.message());
     }
 
@@ -1615,7 +1617,7 @@
     virtual void missing() {
       if (readers.empty()) return;
       ErrorMessage msg;
-      msg << "Nodes section not found in file: " << name;
+      msg << "Nodes section not found in file: @nodes " << name;
       throw IOParameterError(msg.message());
     }
     
@@ -1728,7 +1730,7 @@
     virtual void missing() {
       if (readers.empty()) return;
       ErrorMessage msg;
-      msg << "Edges section not found in file: " << name;
+      msg << "Edges section not found in file: @edges " << name;
       throw IOParameterError(msg.message());
     }
     
@@ -1880,7 +1882,7 @@
     virtual void missing() {
       if (edgeReaders.empty() && uEdgeReaders.empty()) return;
       ErrorMessage msg;
-      msg << "UEdges section not found in file: " << name;
+      msg << "UEdges section not found in file: @uedges " << name;
       throw IOParameterError(msg.message());
     }
     
@@ -2007,7 +2009,7 @@
     virtual void missing() {
       if (readers.empty()) return;
       ErrorMessage msg;
-      msg << "Attribute section not found in file: " << name;
+      msg << "Attribute section not found in file: @attributes " << name;
       throw IOParameterError(msg.message());
     }