git-svn-id: http://www.xerial.org/svn/project/XerialJ/trunk/xerial-core@3311 ae02f08e...

diff --git a/devel/log.config b/devel/log.config
index d566423..b995ba1 100644 (file)
--- a/devel/log.config
+++ b/devel/log.config
@@ -1,2 +1,3 @@
 org.xerial.relation.query.StreamAmoebaJoin-lattice=off\r
-org.xerial.relation.query.StreamAmoebaJoinTest=debug
\ No newline at end of file
+org.xerial.relation.query.StreamAmoebaJoinTest=debug\r
+org.xerial.lens=trace
\ No newline at end of file

diff --git a/src/main/java/org/xerial/lens/ObjectLens.java b/src/main/java/org/xerial/lens/ObjectLens.java
index 6f8f237..2c94380 100644 (file)
--- a/src/main/java/org/xerial/lens/ObjectLens.java
+++ b/src/main/java/org/xerial/lens/ObjectLens.java
@@ -101,7 +101,7 @@ public class ObjectLens
     @Override\r
     public String toString()\r
     {\r
-        return String.format("parameter setter:\n%s\nrelation setter:\n%s", setterContainer, relationSetterContainer);\r
+        return String.format("(%s, %s)", setterContainer, relationSetterContainer);\r
     }\r
 \r
     private void createBindRules(Class< ? > targetType)\r

diff --git a/src/main/java/org/xerial/lens/ObjectMapper.java b/src/main/java/org/xerial/lens/ObjectMapper.java
index 76d6fb8..53076e2 100644 (file)
--- a/src/main/java/org/xerial/lens/ObjectMapper.java
+++ b/src/main/java/org/xerial/lens/ObjectMapper.java
@@ -57,10 +57,7 @@ public class ObjectMapper
     private static Logger _logger = Logger.getLogger(ObjectMapper.class);
     private HashMap<Long, Object> objectHolder = new HashMap<Long, Object>();
 
-    private HashMap<Schema, ObjectLens> schema2lens = new HashMap<Schema, ObjectLens>();
     private HashMap<Schema, Binder> schema2binder = new HashMap<Schema, Binder>();
-    private HashSet<Schema> relationSchema = new HashSet<Schema>();
-
     private Deque<Object> contextNodeStack = new ArrayDeque<Object>();
 
     private static interface Binder
@@ -223,10 +220,8 @@ public class ObjectMapper
 
                 Schema s = builder.build();
                 qs.addQueryTarget(s);
-                //schema2type.put(s, targetType);
 
                 schema2binder.put(s, new AttributeBinder(lens.getTargetType(), each));
-                schema2lens.put(s, lens);
             }
 
             for (RelationSetter each : lens.getRelationSetterList())
@@ -237,11 +232,8 @@ public class ObjectMapper
                 Schema s = new SchemaBuilder().add(each.getCoreNodeName()).add(each.getAttributeNodeName()).build();
                 qs.addQueryTarget(s);
 
-                //schema2type.put(s, targetType);
                 schema2binder.put(s, new RelationBinder(lens, each));
-                schema2lens.put(s, lens);
 
-                relationSchema.add(s);
             }
 
         }
@@ -314,7 +306,7 @@ public class ObjectMapper
         public void text(Schema schema, Node coreNode, String nodeName, String text) throws Exception
         {
             if (_logger.isTraceEnabled())
-                _logger.trace(String.format("text:   (%s, %s:%s) in %s", coreNode, nodeName, text, coreNode, schema));
+                _logger.trace(String.format("text:   (%s, %s:%s) in %s", coreNode, nodeName, text, schema));
 
             Binder binder = schema2binder.get(schema);
             if (binder == null)

diff --git a/src/main/java/org/xerial/lens/ParameterSetter.java b/src/main/java/org/xerial/lens/ParameterSetter.java
index b7f1670..0c1cca8 100644 (file)
--- a/src/main/java/org/xerial/lens/ParameterSetter.java
+++ b/src/main/java/org/xerial/lens/ParameterSetter.java
@@ -101,6 +101,7 @@ public abstract class ParameterSetter
 \r
             if (!targetField.isAccessible())\r
                 targetField.setAccessible(true);\r
+\r
         }\r
 \r
         @Override\r

diff --git a/src/main/java/org/xerial/lens/RelationSetter.java b/src/main/java/org/xerial/lens/RelationSetter.java
index d601e79..ff0266d 100644 (file)
--- a/src/main/java/org/xerial/lens/RelationSetter.java
+++ b/src/main/java/org/xerial/lens/RelationSetter.java
@@ -77,7 +77,8 @@ public abstract class RelationSetter
     @Override\r
     public String toString()\r
     {\r
-        return String.format("[%s, %s]", coreNodeName, attributeNodeName);\r
+        return String.format("(%s[%s], %s[%s])", coreNodeName, coreNodeType.getSimpleName(), attributeNodeName,\r
+                attributeNodeType.getSimpleName());\r
     }\r
 \r
     @Override\r

diff --git a/src/main/java/org/xerial/util/log/Logger.java b/src/main/java/org/xerial/util/log/Logger.java
index 150481e..12178bb 100644 (file)
--- a/src/main/java/org/xerial/util/log/Logger.java
+++ b/src/main/java/org/xerial/util/log/Logger.java
@@ -67,7 +67,7 @@ public class Logger
     static
     {
         _rootLogger.setLogLevel(LogLevel.INFO);
-        _rootLogger.setOutputWriter(new OutputStreamWriter(System.out));
+        _rootLogger.setOutputWriter(new OutputStreamWriter(System.err));
         _rootLogger._loggerFullName = "root";
         _rootLogger._loggerShortName = "root";
 

diff --git a/src/test/java/org/xerial/lens/ObjectMapperTest.java b/src/test/java/org/xerial/lens/ObjectMapperTest.java
index 3c38d22..3b9d782 100644 (file)
--- a/src/test/java/org/xerial/lens/ObjectMapperTest.java
+++ b/src/test/java/org/xerial/lens/ObjectMapperTest.java
@@ -63,6 +63,7 @@ public class ObjectMapperTest
     // query: (gene, name, start, end, strand)
     public static class GeneData
     {
+        public int id;
         public String name;
         public long start;
         public long end;
@@ -78,8 +79,8 @@ public class ObjectMapperTest
         @Override
         public String toString()
         {
-            return String.format("name=%s, start=%s, end=%s, strand=%s, sequence=%s", name, start, end, strand,
-                    sequence.toString());
+            return String.format("id=%d, name=%s, start=%s, end=%s, strand=%s, sequence=%s", id, name, start, end,
+                    strand, sequence.toString());
         }
     }
 

diff --git a/src/test/java/org/xerial/lens/gene.silk b/src/test/java/org/xerial/lens/gene.silk
index d2e07cf..dbda212 100644 (file)
--- a/src/test/java/org/xerial/lens/gene.silk
+++ b/src/test/java/org/xerial/lens/gene.silk
@@ -3,7 +3,7 @@
  -sequence>\r
   AACCGG\r
   CCCCGG\r
- -gene(id:1, name:gene1, start:100000, end:200000, strand:+)\r
+ -gene(id:1, name:gene1, start:100000, end:200000, strand:+, _[json]:{"memo":"hello"} )\r
  -gene(id:2, name:gene2, start:500000, end:700000, strand:-)\r
   -sequence>\r
  ACCGCTT\r