Concept:Family/Java - Revision history

Wf: created by WikiTask 2017-10-10T09:54:09Z

2017-10-10T09:54:10Z

created by WikiTask 2017-10-10T09:54:09Z

Wf: created by WikiTask 2017-10-10T09:51:18Z

2017-10-10T09:51:18Z

created by WikiTask 2017-10-10T09:51:18Z

Wf: created by WikiTask 2017-10-10T06:13:28Z

2017-10-10T06:13:29Z

created by WikiTask 2017-10-10T06:13:28Z

Wf: created by WikiTask 2017-10-08T15:48:16Z

2017-10-08T15:48:16Z

created by WikiTask 2017-10-08T15:48:16Z

Wf: created by WikiTask 2017-10-07T05:01:20Z

2017-10-07T05:01:20Z

created by WikiTask 2017-10-07T05:01:20Z

Wf: created by WikiTask 2017-10-06T08:10:43Z

2017-10-06T08:10:43Z

created by WikiTask 2017-10-06T08:10:43Z

Wf: created by WikiTask 2017-10-05T12:33:33Z

2017-10-05T12:33:33Z

created by WikiTask 2017-10-05T12:33:33Z

Wf: created by WikiTask 2017-10-05T12:26:20Z

2017-10-05T12:26:20Z

created by WikiTask 2017-10-05T12:26:20Z

Wf: created by WikiTask 2017-10-03T19:42:47Z

2017-10-03T19:42:47Z

created by WikiTask 2017-10-03T19:42:47Z

Wf: created by WikiTask 2017-10-03T19:33:21Z

2017-10-03T19:33:21Z

created by WikiTask 2017-10-03T19:33:21Z

Show changes

@@ Line 58: / Line 58: @@
          // "John" is lastname of it
          // convert double quotes to single quotes - FIXME - should we escape instead?
-         value=value.replace(""\","'");
+         value=value.replace("\"","'");
          result = String.format("%s%s%s is %s of it\n",quote,value,quote,name);
+       }

@@ Line 37: / Line 37: @@
      /**
-      * get the propertySidif of the given property
+      * get the SiDIF representation of the given property
+      *
-      * @param name
+      * @param name - the name of the property
-      * @param value
+      * @param value - the value of the property
-      * @return
+     * @param type - the type of the property
       */
      public static String propertySiDIF(String name, String value, String type) {
-       // default is an empty string - no property line for emtpy values
+       // default is a comment line which can be filled by uncommenting
-       String result = "";
+       String result = String.format("# is is %s of it\n",name);;
        // if the value is not empty
        if ((value != null) && (!("".equals(value.trim())))) {
@@ Line 56: / Line 57: @@
          // create a SIDIF Property line like
          // "John" is lastname of it
-         result += quote + value + quote + " is " + name + " of it\n";
+         // convert double quotes to single quotes - FIXME - should we escape instead?
+       }
        // return the SiDIF property line
@@ Line 133: / Line 136: @@
      /**
       * convert this Family to a WikiSon string
       */
      public String toWikiSon() {
@@ Line 146: / Line 150: @@
        wikison+="}}\n";
        return wikison;
+     }
@@ Line 370: / Line 391: @@
      /**
       * convert this Person to a WikiSon string
       */
      public String toWikiSon() {
@@ Line 394: / Line 416: @@
        wikison+="}}\n";
        return wikison;
+     }

@@ Line 107: / Line 107: @@
      public String monthMarried;
      public String divorced;
      public String husbandOf;
      public String wifeOf;
@@ Line 123: / Line 122: @@
      public String getDivorced() { return divorced; }
      public void setDivorced(String pDivorced) { divorced=pDivorced; }
      public String getHusbandOf() { return husbandOf; }
      public void setHusbandOf(String pHusbandOf) { husbandOf=pHusbandOf; }
@@ Line 145: / Line 142: @@
        wikison+=toWikiSon("monthMarried",monthMarried);
        wikison+=toWikiSon("divorced",divorced);
        wikison+=toWikiSon("husbandOf",husbandOf);
        wikison+=toWikiSon("wifeOf",wifeOf);
@@ Line 208: / Line 204: @@
        if (divorcedTriple!=null)
          divorced=divorcedTriple.getObject().toString();
        Triple husbandOfTriple=query.selectSingle(pageid,"husbandOf",null);
        if (husbandOfTriple==null)
@@ Line 331: / Line 322: @@
      public String wikiPedia;
      public String childOf;
      public String spouse;
@@ Line 367: / Line 359: @@
      public String getChildOf() { return childOf; }
      public void setChildOf(String pChildOf) { childOf=pChildOf; }
      public String getSpouse() { return spouse; }
      public void setSpouse(String pSpouse) { spouse=pSpouse; }
@@ Line 396: / Line 390: @@
        wikison+=toWikiSon("wikiPedia",wikiPedia);
        wikison+=toWikiSon("childOf",childOf);
        wikison+=toWikiSon("spouse",spouse);
        wikison+="}}\n";
@@ Line 512: / Line 507: @@
        if (childOfTriple!=null)
          childOf=childOfTriple.getObject().toString();
        Triple spouseTriple=query.selectSingle(pageid,"spouse",null);
        if (spouseTriple==null)

@@ Line 314: / Line 314: @@
    public static class Person extends TopicBase {
-     public String id;
+     public String qid;
      public String name;
      public String nobleTitle;
@@ Line 330: / Line 331: @@
      public String wikiPedia;
      public String childOf;
-     public String getId() { return id; }
+     public String getQid() { return qid; }
-     public void setId(String pId) { id=pId; }
+     public void setQid(String pQid) { qid=pQid; }
      public String getName() { return name; }
      public void setName(String pName) { name=pName; }
@@ Line 363: / Line 367: @@
      public String getChildOf() { return childOf; }
      public void setChildOf(String pChildOf) { childOf=pChildOf; }
      /**
       * convert this Person to a JSON string
@@ Line 373: / Line 379: @@
      public String toWikiSon() {
        String wikison= "{{Person\n";
-       wikison+=toWikiSon("id",id);
+       wikison+=toWikiSon("qid",qid);
        wikison+=toWikiSon("name",name);
        wikison+=toWikiSon("nobleTitle",nobleTitle);
@@ Line 389: / Line 396: @@
        wikison+=toWikiSon("wikiPedia",wikiPedia);
        wikison+=toWikiSon("childOf",childOf);
        wikison+="}}\n";
        return wikison;
@@ Line 419: / Line 427: @@
      public Person(TripleQuery query,String pageid) {
        this.pageid=pageid;
-       Triple idTriple=query.selectSingle(pageid,"id",null);
+       Triple qidTriple=query.selectSingle(pageid,"qid",null);
-       if (idTriple==null)
+       if (qidTriple==null)
-         idTriple=query.selectSingle(pageid,"Property:Person_id",null);
+         qidTriple=query.selectSingle(pageid,"Property:Person_qid",null);
-       if (idTriple!=null)
+       if (qidTriple!=null)
-         id=idTriple.getObject().toString();
+         qid=qidTriple.getObject().toString();
        Triple nameTriple=query.selectSingle(pageid,"name",null);
        if (nameTriple==null)
@@ Line 499: / Line 512: @@
        if (childOfTriple!=null)
          childOf=childOfTriple.getObject().toString();
        init(query);
      } // constructor for Person

@@ Line 318: / Line 318: @@
      public String nobleTitle;
      public String picture;
      public String born;
      public String yearBorn;
@@ Line 338: / Line 339: @@
      public String getPicture() { return picture; }
      public void setPicture(String pPicture) { picture=pPicture; }
      public String getBorn() { return born; }
      public void setBorn(String pBorn) { born=pBorn; }
@@ Line 374: / Line 377: @@
        wikison+=toWikiSon("nobleTitle",nobleTitle);
        wikison+=toWikiSon("picture",picture);
        wikison+=toWikiSon("born",born);
        wikison+=toWikiSon("yearBorn",yearBorn);
@@ Line 435: / Line 439: @@
        if (pictureTriple!=null)
          picture=pictureTriple.getObject().toString();
        Triple bornTriple=query.selectSingle(pageid,"born",null);
        if (bornTriple==null)

@@ Line 324: / Line 324: @@
      public String yearDied;
      public String monthDied;
      public String getName() { return name; }
@@ Line 345: / Line 348: @@
      public String getMonthDied() { return monthDied; }
      public void setMonthDied(String pMonthDied) { monthDied=pMonthDied; }
      /**
       * convert this Person to a JSON string
@@ Line 365: / Line 374: @@
        wikison+=toWikiSon("yearDied",yearDied);
        wikison+=toWikiSon("monthDied",monthDied);
        wikison+="}}\n";
        return wikison;
@@ Line 445: / Line 457: @@
        if (monthDiedTriple!=null)
          monthDied=monthDiedTriple.getObject().toString();
        init(query);
      } // constructor for Person