/ - Diff - BIEN 3 - NCEAS Projects

« Previous | Next »

Revision 10

Added by Matt Wheeler about 14 years ago

Added ability to change the vegx node names to be different from the postgres table names.
This was the easiest way to change the postgres table names when the vegx names are
not useable for some reason. This requires that the node names be altered in the xsd
definition and then mapped back to the orginal node name in the types.php file.

           $type = $ref;
+        }
         $name = $childNode->getAttribute('name');
         if($ref != '' && $name == '') {
           $name = $this->tableName . "_" . $ref;
         if($ref != '' && $name == '' /*&& !isPrimitiveType($ref)*/) {
           $name = $ref;
+        }
         if($name == '') {
-...
+      }
       public function toString() {
         global $tableRenames;
         $str = "class " . $this->tableName . "(models.Model):\n";
         #All entities need reference to their creation info since
-...
         foreach(array_keys($this->references) as $colName) {
           $def = $this->references[$colName];
           $str .= "  $colName = $def\n";
           $effectiveColName = $tableRenames[$colName] == null ? $colName : $tableRenames[$colName];
           $str .= "  $effectiveColName = $def\n";
+        }
         foreach(array_keys($this->members) as $colName) {
           $def = $this->members[$colName];
-...
+      }
       public function makeImportFunction() {
         global $tableRenames;
         #Slightly different if there are no members
         if(count($this->references) == 0 &&
            count($this->members) == 0 &&
-...
               $i += 1;
               $tabType = $nativeVegXPointers[$colName]['fk_type'];
               $toField = $nativeVegXPointers[$colName]['to_field'];
               $def .= "      $ifStmt cName == '$colName':\n".
               $effectiveColName = $tableRenames[$colName] == null ? $colName : $tableRenames[$colName];
               $def .= "      $ifStmt cName == '$effectiveColName':\n".
                       "        if(len(child.childNodes) > 0):\n".
                       "          cVal = child.childNodes[0].nodeValue\n".
                       "          q = $tabType.objects.filter($toField" . "__exact = cVal)\n".
                       "          q = $tabType.objects.filter(entryInfo__id__exact = self.entryInfo.id)\n".
                       "          if len(q) > 0:\n".
                       "            self.$colName = q[0]\n";
                       "            self.$effectiveColName = q[0]\n";
             } else {
               $ifStmt = $i == 0 ? 'if' : 'elif';
               $i += 1;
               $def .= "      $ifStmt cName == '$colName':\n".
               $effectiveColName = $tableRenames[$colName] == null ? $colName : $tableRenames[$colName];
               $def .= "      $ifStmt cName == '$effectiveColName':\n".
                       "        if(len(child.childNodes) > 0):\n".
                       "          cVal = child.childNodes[0].nodeValue\n".
                       "          self.$colName = cVal\n";
                       "          self.$effectiveColName = cVal\n";
+            }
+          }
+        }
-...
              preg_match("/Complex one2Many/",$colDef) > 0 && preg_match("/_extend/",$colDef) == 0 &&
              preg_match("/_id/",$colName) == 0) {
             $i += 1;
             $def .= "      $ifStmt cName == '$colName':\n".
             $effectiveColName = $tableRenames[$colName] == null ? $colName : $tableRenames[$colName];
             $def .= "      $ifStmt cName == '$effectiveColName':\n".
                     "        newEl = $matches[2]().retrieveOrNew(child)\n".
                     "        newEl.importVegX(child,info)\n".
                     "        self.$colName = newEl\n";
                     "        self.$effectiveColName = newEl\n";
+          }
           if(preg_match("/(ManyToManyField\(')([a-zA-Z]*)/",$colDef,$matches) > 0) {
             $effectiveColName = $tableRenames[$colName] == null ? $colName : $tableRenames[$colName];
             $i += 1;
             $def .= "      $ifStmt cName == '$colName':\n".
             $def .= "      $ifStmt cName == '$effectiveColName':\n".
                     "        newEl = $matches[2]().retrieveOrNew(child)\n".
                     "        newEl.importVegX(child,info)\n".
                     "        self.$colName.add(newEl)\n";
                     "        self.$effectiveColName.add(newEl)\n";
+          }
+        }
-...
           $i += 1;
           $colDef = $this->referrers[$colName];
           $elReferenceBack = $this->tableName . '_id';
           $def .= "      $ifStmt cName == '$colName':\n".
           $effectiveColName = $tableRenames[$colName] == null ? $colName : $tableRenames[$colName];
           $def .= "      $ifStmt cName == '$effectiveColName':\n".
                   "        newEl = $colDef().retrieveOrNew(child)\n".
                   "        newEl.$elReferenceBack = self\n".
                   "        newEl.importVegX(child,info)\n";
-...
+      }
       public function makeExportFunction() {
         global $tableRenames;
         #Slightly different if there are no members
         if(count($this->references) == 0 &&
            count($this->members) == 0 &&
-...
           if(preg_match("/(ForeignKey\(')([a-zA-Z]*)/",$colDef,$matches) > 0 &&
              (preg_match("/Complex one2Many/",$colDef) > 0 || preg_match("/_extend/",$colName) > 0) &&
              preg_match("/_id/",$colName) == 0) {
             $effectiveColName = $tableRenames[$colName] == null ? $colName : $tableRenames[$colName];
             if(preg_match("/_extend/",$colName) == 0) {
               $def .= "    if self.$colName != None:\n".
                       "      newEl = doc.createElement('$colName')\n".
                       "      myNode.appendChild(self.$colName.exportVegX(newEl,doc))\n\n";
               $def .= "    if self.$effectiveColName != None:\n".
                       "      newEl = doc.createElement('$effectiveColName')\n".
                       "      myNode.appendChild(self.$effectiveColName.exportVegX(newEl,doc))\n\n";
             } else {
               $def .= "    if self.$colName != None:\n".
                       "      myNode = self.$colName.exportVegX(myNode,doc)\n\n";
+            }
+          }
           if(preg_match("/(ManyToManyField\(')([a-zA-Z]*)/",$colDef,$matches) > 0) {
             $effectiveColName = $tableRenames[$colName] == null ? $colName : $tableRenames[$colName];
             $def .= "    for childRef in self.$colName.all():\n".
                     "      newEl = doc.createElement('$colName')\n".
                     "      newEl = doc.createElement('$effectiveColName')\n".
                     "      myNode.appendChild(childRef.exportVegX(newEl,doc))\n\n";
+          }
+        }
-...
               $nodeNameToUse = $this->tableName . '_any_nodes';
+            }
             $relatedName = $nodeNameToUse . '_' . $this->tableName . '_id';
             $effectiveNodeName = $nodeName;
             if($tableRenames[$nodeName] != null) {
               $effectiveNodeName = $tableRenames[$nodeName];
+            }
             $def .= "    for childRef in self.$relatedName.all():\n".
                     "      newEl = doc.createElement('$nodeName')\n".
                     "      newEl = doc.createElement('$effectiveNodeName')\n".
                     "      myNode.appendChild(childRef.exportVegX(newEl,doc))\n\n";
+          }
+        }
-...
+      }
       public function makeExportDummyDataFunction() {
         global $tableRenames;
         #Slightly different if there are no members
         if(count($this->references) == 0 &&
            count($this->members) == 0 &&
-...
              (preg_match("/Complex one2Many/",$colDef) > 0 || preg_match("/_extend/",$colName) > 0) &&
              preg_match("/_id/",$colName) == 0) {
             if(preg_match("/_extend/",$colName) == 0) {
               $effectiveColName = $tableRenames[$colName] == null ? $colName : $tableRenames[$colName];
               $def .= "    if '$matches[2]' not in usedObjectsStack:\n".
                       "      usedObjectsStack.append('$matches[2]')\n".
                       "      newEl = doc.createElement('$colName')\n".
                       "      newEl = doc.createElement('$effectiveColName')\n".
                       "      newElObj = $matches[2]()\n".
                       "      myNode.appendChild(newElObj.exportDummyVegX(newEl,doc,usedObjectsStack))\n".
                       "      usedObjectsStack.pop()\n\n";
-...
+            }
+          }
           if(preg_match("/(ManyToManyField\(')([a-zA-Z]*)/",$colDef,$matches) > 0) {
             $effectiveColName = $tableRenames[$colName] == null ? $colName : $tableRenames[$colName];
             $def .= "    if '$matches[2]' not in usedObjectsStack:\n".
                     "      usedObjectsStack.append('$matches[2]')\n".
                     "      newEl = doc.createElement('$colName')\n".
                     "      newEl = doc.createElement('$effectiveColName')\n".
                     "      newElObj = $matches[2]()\n".
                     "      myNode.appendChild(newElObj.exportDummyVegX(newEl,doc,usedObjectsStack))\n".
                     "      usedObjectsStack.pop()\n\n";
-...
                     "      myNode.setAttributeNode(childRef.exportDummyVegX(newEl,doc,usedObjectsStack))\n".
                     "      usedObjectsStack.pop()\n\n";
           } else {
             $effectiveNodeName = $tableRenames[$nodeName] == null ? $nodeName : $tableRenames[$nodeName];
             $def .= "    if '$colDef' not in usedObjectsStack:\n".
                     "      usedObjectsStack.append('$colDef')\n\n".
                     "      newEl = doc.createElement('$nodeName')\n".
                     "      newEl = doc.createElement('$effectiveNodeName')\n".
                     "      childRef = $colDef()\n".
                     "      myNode.appendChild(childRef.exportDummyVegX(newEl,doc,usedObjectsStack))\n".
                     "      usedObjectsStack.pop()\n\n";

     'TaxonRelationshipAssertion' => True,
     'Specimen' => True,
     'Publication' => True,
     'ScientificName' => True,
     'vegX' => True,
     'TaxonConceptType' => True
     );
-...
     'TemporalCoverage' => True,
     'TaxonomicCoverage' => True,
     'temporalCoverageLC' => True,
     'taxonomicCoverageLC' => True
     'taxonomicCoverageLC' => True,
     'ScientificName' => True
     );
     function handleAdHocAttr($tName) {
-...
       $secondaryNodeNames = array();
       switch($tName) {
         case 'ScientificName':
           $primaryKey = 'attr_id__exact';
           $primaryAttrName = 'id';
           break;
         case 'TemporalCoverage':
           $primaryKey = 'attr_id__exact';
           $primaryAttrName = 'id';

     );
     $tableRenames = array(
       "taxonNames" => "taxonNamesLC",
       "taxonConcepts" => "taxonConceptsLC",
       "temporalCoverage" => "temporalCoverageLC"
       "taxonNamesLC" => "taxonNames",
       "taxonConceptsLC" => "taxonConcepts",
       "temporalCoverageLC" => "temporalCoverage",
       "taxonomicCoverageLC" => "taxonomicCoverage",
       "taxonRelationshipAssertionMapList" => "taxonRelationshipAssertions",
       "taxonRelationshipAssertionMap" => "taxonRelationshipAssertion"
     );
     ?>

     			<xsd:element name="groupType" minOccurs="0"/>
     			<xsd:element name="originalDetermination" minOccurs="0"/>
     			<xsd:element name="currentDetermination" minOccurs="0"/>
     			<xsd:element name="taxonRelationshipAssertions">
                             <!-- Changed name purely for ease of coding BIEN3.  There is another entity that differs only by the capitalization of the first letter:  TaxonRelationshipAssertions.  This causes a lot of issues for Django and Postgres.  I'm changing the name here due to the lameness of the model building script.  The script will make sure that the BIEN3 model adheres to the actual VegX xsd specifications. -->
     			<!-- <xsd:element name="taxonRelationshipAssertions"> -->
     			<xsd:element name="taxonRelationshipAssertionMapList">
     				<xsd:annotation>
     					<xsd:documentation>Container for taxonomic or nomenclatural assertion records.</xsd:documentation>
     				</xsd:annotation>
     				<xsd:complexType>
     					<xsd:sequence>
     						<xsd:element name="taxonRelationshipAssertion" maxOccurs="unbounded">
                                                     <!-- same comment as above -->
     						<!-- <xsd:element name="taxonRelationshipAssertion" maxOccurs="unbounded"> -->
     						<xsd:element name="taxonRelationshipAssertionMap" maxOccurs="unbounded">
     							<xsd:annotation>
     								<xsd:documentation xml:lang="en">A specific taxonomic or nomenclatural assertion record.</xsd:documentation>
     							</xsd:annotation>

Also available in: Unified diff

Project

General

Profile

Revision 10

Added by Matt Wheeler about 14 years ago