@@ -423,22 +424,22 @@ class MiniXMLElement extends MiniXMLTree
return $this;
}
} else {
-
+
if (strcasecmp($this->xname,$name) == 0)
{
return $this;
}
}
-
+
***** end commented out section ****
*/
-
+
if (! $this->xnumChildren )
{
/* Not match here and and no kids - not found... */
return NULL;
}
-
+
/* Try each child (immediate children take priority) */
for ($i = 0; $i < $this->xnumChildren; $i++)
{
@@ -460,9 +461,9 @@ class MiniXMLElement extends MiniXMLTree
}
} /* end if case sensitive */
} /* end if child has a name */
-
+
} /* end loop over all my children */
-
+
/* Use beautiful recursion, daniel san */
for ($i = 0; $i < $this->xnumChildren; $i++)
{
@@ -476,14 +477,14 @@ class MiniXMLElement extends MiniXMLTree
return $theelement;
}
}
-
+
/* Not found */
- return NULL;
-
-
+ return _MiniXMLReturnNullByRef();
+
+
} /* end method getElement */
-
-
+
+
/* getElementByPath PATH
** Attempts to return a reference to the (first) element at PATH
** where PATH is the path in the structure (relative to this element) to
@@ -518,7 +519,7 @@ class MiniXMLElement extends MiniXMLTree
** BUT be careful:
** $accessid =& $partRate->getElementByPath('partList/partNum');
**
- ** will return the partNum element with the value "DA42". Other partNums are
+ ** will return the partNum element with the value "DA42". Other partNums are
** inaccessible by getElementByPath() - Use MiniXMLElement::getAllChildren() instead.
**
** Returns the MiniXMLElement reference if found, NULL otherwise.
@@ -526,7 +527,7 @@ class MiniXMLElement extends MiniXMLTree
function &getElementByPath($path)
{
$names = split ("/", $path);
-
+
$element = $this;
foreach ($names as $elementName)
{
@@ -536,18 +537,18 @@ class MiniXMLElement extends MiniXMLTree
$element =& $element->getElement($elementName);
}
}
-
+
return $element;
-
+
} /* end method getElementByPath */
-
-
-
+
+
+
/* numChildren [NAMED]
- **
+ **
** Returns the number of immediate children for this element
**
- ** If the optional NAMED parameter is passed, returns only the
+ ** If the optional NAMED parameter is passed, returns only the
** number of immediate children named NAMED.
*/
function numChildren ($named=NULL)
@@ -556,16 +557,16 @@ class MiniXMLElement extends MiniXMLTree
{
return $this->xnumElementChildren;
}
-
+
/* We require only children named '$named' */
$allkids =& $this->getAllChildren($named);
-
+
return count($allkids);
-
-
+
+
}
-
+
/* getAllChildren [NAME]
**
** Returns a reference to an array of all this element's MiniXMLElement children
@@ -577,7 +578,7 @@ class MiniXMLElement extends MiniXMLTree
{
$retArray = array();
$count = 0;
-
+
if (is_null($name))
{
/* Return all element children */
@@ -607,71 +608,71 @@ class MiniXMLElement extends MiniXMLTree
$retArray[$count++] =& $this->xchildren[$i];
}
} /* end if case sensitive */
-
+
} /* end if child is a MiniXMLElement object */
-
+
} /* end loop over all children */
-
+
} /* end if specific name was requested */
-
+
return $retArray;
-
+
} /* end method getAllChildren */
-
-
-
+
+
+
function &insertChild (&$child, $idx=0)
{
-
-
-
+
+
+
if (! $this->_validateChild($child))
{
return;
}
-
- /* Set the parent for the child element to this element if
+
+ /* Set the parent for the child element to this element if
** avoidLoops or MINIXML_AUTOSETPARENT is set
*/
if ($this->xavoidLoops || (MINIXML_AUTOSETPARENT > 0) )
{
if ($this->xparent == $child)
{
-
+
$cname = $child->name();
- return _MiniXMLError("MiniXMLElement::insertChild() Tryng to append parent $cname as child of "
+ return _MiniXMLError("MiniXMLElement::insertChild() Tryng to append parent $cname as child of "
. $this->xname );
}
$child->parent($this);
}
-
-
+
+
$nextIdx = $this->xnumChildren;
$lastIdx = $nextIdx - 1;
if ($idx > $lastIdx)
{
-
+
if ($idx > $nextIdx)
{
$idx = $lastIdx + 1;
}
- $this->xchildren[$idx] = $child;
+ $this->xchildren[$idx] =& $child;
$this->xnumChildren++;
if ($this->isElement($child))
{
$this->xnumElementChildren++;
}
-
+
} elseif ($idx >= 0)
{
-
+
$removed = array_splice($this->xchildren, $idx);
array_push($this->xchildren, $child);
$numRemoved = count($removed);
-
+
for($i=0; $i<$numRemoved; $i++)
{
-
+
array_push($this->xchildren, $removed[$i]);
}
$this->xnumChildren++;
@@ -679,23 +680,23 @@ class MiniXMLElement extends MiniXMLTree
{
$this->xnumElementChildren++;
}
-
-
+
+
} else {
$revIdx = (-1 * $idx) % $this->xnumChildren;
$newIdx = $this->xnumChildren - $revIdx;
-
+
if ($newIdx < 0)
{
return _MiniXMLError("Element::insertChild() Ended up with a negative index? ($newIdx)");
}
-
+
return $this->insertChild($child, $newIdx);
}
-
+
return $child;
}
-
+
/* appendChild CHILDELEMENT
**
@@ -714,96 +715,96 @@ class MiniXMLElement extends MiniXMLTree
*/
function &appendChild (&$child)
{
-
+
if (! $this->_validateChild($child))
{
_MiniXMLLog("MiniXMLElement::appendChild() Could not validate child, aborting append");
- return NULL;
+ return _MiniXMLReturnNullByRef();
}
-
- /* Set the parent for the child element to this element if
+
+ /* Set the parent for the child element to this element if
** avoidLoops or MINIXML_AUTOSETPARENT is set
*/
if ($this->xavoidLoops || (MINIXML_AUTOSETPARENT > 0) )
{
if ($this->xparent == $child)
{
-
+
$cname = $child->name();
- return _MiniXMLError("MiniXMLElement::appendChild() Tryng to append parent $cname as child of "
+ return _MiniXMLError("MiniXMLElement::appendChild() Tryng to append parent $cname as child of "
. $this->xname );
}
$child->parent($this);
}
-
-
+
+
$this->xnumElementChildren++; /* Note that we're addind a MiniXMLElement child */
-
+
/* Add the child to the list */
$idx = $this->xnumChildren++;
$this->xchildren[$idx] =& $child;
-
+
return $this->xchildren[$idx];
-
+
} /* end method appendChild */
-
-
+
+
/* prependChild CHILDELEMENT
**
** prependChild is used to prepend an existing MiniXMLElement object to
- ** this element's list. The child will be positioned at the begining of
+ ** this element's list. The child will be positioned at the begining of
** the elements child list, thus it will be output first in the resulting XML.
**
** Returns a reference to the prepended child element.
*/
function &prependChild ($child)
{
-
-
+
+
if (! $this->_validateChild($child))
{
_MiniXMLLog("MiniXMLElement::prependChild - Could not validate child, aborting.");
- return NULL;
+ return _MiniXMLReturnNullByRef();
}
-
- /* Set the parent for the child element to this element if
+
+ /* Set the parent for the child element to this element if
** avoidLoops or MINIXML_AUTOSETPARENT is set
*/
if ($this->xavoidLoops || (MINIXML_AUTOSETPARENT > 0) )
{
if ($this->xparent == $child)
{
-
+
$cname = $child->name();
- return _MiniXMLError("MiniXMLElement::prependChild() Tryng to append parent $cname as child of "
+ return _MiniXMLError("MiniXMLElement::prependChild() Tryng to append parent $cname as child of "
. $this->xname );
}
$child->parent($this);
}
-
-
+
+
$this->xnumElementChildren++; /* Note that we're adding a MiniXMLElement child */
-
+
/* Add the child to the list */
$idx = $this->xnumChildren++;
array_unshift($this->xchildren, $child);
return $this->xchildren[0];
-
+
} /* end method prependChild */
-
+
function _validateChild (&$child)
{
-
+
if (is_null($child))
{
return _MiniXMLError("MiniXMLElement::_validateChild() need to pass a non-NULL MiniXMLElement child.");
}
-
- if (! method_exists($child, 'MiniXMLElement'))
+
+ if (!$child->iselement)
{
return _MiniXMLError("MiniXMLElement::_validateChild() must pass a MiniXMLElement object to _validateChild.");
}
-
+
/* Make sure element is named */
$cname = $child->name();
if (is_null($cname))
@@ -811,8 +812,8 @@ class MiniXMLElement extends MiniXMLTree
_MiniXMLLog("MiniXMLElement::_validateChild() children must be named");
return 0;
}
-
-
+
+
/* Check for loops */
if ($child == $this)
{
@@ -824,11 +825,11 @@ class MiniXMLElement extends MiniXMLTree
. "while avoidLoops is on - aborting");
return 0;
}
-
+
return 1;
}
/* createChild ELEMENTNAME [VALUE]
- **
+ **
** Creates a new MiniXMLElement instance and appends it to the list
** of this element's children.
** The new child element's name is set to ELEMENTNAME.
@@ -850,16 +851,14 @@ class MiniXMLElement extends MiniXMLTree
{
return _MiniXMLError("MiniXMLElement::createChild() Must pass a NAME to createChild.");
}
-
+
if (! is_string($name))
{
return _MiniXMLError("MiniXMLElement::createChild() Name of child must be a STRING");
}
-
- $child = new MiniXMLElement($name);
-
- $appendedChild =& $this->appendChild($child);
-
+
+ $appendedChild =& $this->appendChild(new MiniXMLElement($name));
+
if (! $appendedChild )
{
_MiniXMLLog("MiniXMLElement::createChild() '$name' child NOT appended.");
@@ -876,21 +875,21 @@ class MiniXMLElement extends MiniXMLTree
$appendedChild->text($value);
}
}
-
+
$appendedChild->avoidLoops($this->xavoidLoops);
-
+
return $appendedChild;
-
+
} /* end method createChild */
-
-
-
+
+
+
/* removeChild CHILD
** Removes CHILD from this element's list of children.
**
** Returns the removed child, if found, NULL otherwise.
*/
-
+
function &removeChild (&$child)
{
if (! $this->xnumChildren)
@@ -901,7 +900,7 @@ class MiniXMLElement extends MiniXMLTree
}
return NULL;
}
-
+
$foundChild = NULL;
$idx = 0;
while ($idx < $this->xnumChildren && ! $foundChild)
@@ -913,7 +912,7 @@ class MiniXMLElement extends MiniXMLTree
$idx++;
}
}
-
+
if (! $foundChild)
{
if (MINIXML_DEBUG > 0)
@@ -922,20 +921,20 @@ class MiniXMLElement extends MiniXMLTree
}
return NULL;
}
-
+
array_splice($this->xchildren, $idx, 1);
-
+
$this->xnumChildren--;
if ($this->isElement($foundChild))
{
$this->xnumElementChildren--;
}
-
+
unset ($foundChild->xparent) ;
return $foundChild;
}
-
-
+
+
/* removeAllChildren
** Removes all children of this element.
**
@@ -944,46 +943,47 @@ class MiniXMLElement extends MiniXMLTree
function &removeAllChildren ()
{
$emptyArray = array();
-
+
if (! $this->xnumChildren)
{
return $emptyArray;
}
-
+
$retList =& $this->xchildren;
-
+
$idx = 0;
while ($idx < $this->xnumChildren)
{
unset ($retList[$idx++]->xparent);
}
-
+
+ unset($this->xchildren);
$this->xchildren = array();
$this->xnumElementChildren = 0;
$this->xnumChildren = 0;
-
-
+
+
return $retList;
}
-
-
+
+
function & remove ()
{
$parent =& $this->parent();
-
+
if (!$parent)
{
_MiniXMLLog("XML::Mini::Element::remove() called for element with no parent set. Aborting.");
return NULL;
}
-
+
$removed =& $parent->removeChild($this);
-
+
return $removed;
}
-
-
-
+
+
+
/* parent NEWPARENT
**
** The parent() method is used to get/set the element's parent.
@@ -995,10 +995,10 @@ class MiniXMLElement extends MiniXMLTree
**
** Note: This method is mainly used internally and you wouldn't normally need
** to use it.
- ** It get's called on element appends when MINIXML_AUTOSETPARENT or
+ ** It get's called on element appends when MINIXML_AUTOSETPARENT or
** MINIXML_AVOIDLOOPS or avoidLoops() > 1
**
- */
+ */
function &parent (&$setParent)
{
if (! is_null($setParent))
@@ -1010,12 +1010,12 @@ class MiniXMLElement extends MiniXMLTree
}
$this->xparent = $setParent;
}
-
+
return $this->xparent;
-
+
} /* end method parent */
-
-
+
+
/* avoidLoops SETTO
**
** The avoidLoops() method is used to get or set the avoidLoops flag for this element.
@@ -1025,7 +1025,7 @@ class MiniXMLElement extends MiniXMLTree
** in the heirarchy.
**
** The avoidLoops default behavior is configured with the MINIXML_AVOIDLOOPS define but can be
- ** set on individual elements (and automagically all the element's children) with the
+ ** set on individual elements (and automagically all the element's children) with the
** avoidLoops() method.
**
** Returns the current value of the avoidLoops flag for the element.
@@ -1037,13 +1037,13 @@ class MiniXMLElement extends MiniXMLTree
{
$this->xavoidLoops = $setTo;
}
-
+
return $this->xavoidLoops;
}
-
-
+
+
/* toString [SPACEOFFSET]
- **
+ **
** toString returns an XML string based on the element's attributes,
** and content (recursively doing the same for all children)
**
@@ -1051,7 +1051,7 @@ class MiniXMLElement extends MiniXMLTree
** after newlines for elements at this level (adding 1 space per level in
** depth). SPACEOFFSET defaults to 0.
**
- ** If SPACEOFFSET is passed as MINIXML_NOWHITESPACES.
+ ** If SPACEOFFSET is passed as MINIXML_NOWHITESPACES.
** no \n or whitespaces will be inserted in the xml string
** (ie it will all be on a single line with no spaces between the tags.
**
@@ -1067,7 +1067,7 @@ class MiniXMLElement extends MiniXMLTree
** calling the appropriate With/No WhiteSpaces toString on it's children - thereby
** avoiding the test on SPACEOFFSET
*/
-
+
function toString ($depth=0)
{
if ($depth == MINIXML_NOWHITESPACES)
@@ -1077,50 +1077,50 @@ class MiniXMLElement extends MiniXMLTree
return $this->toStringWithWhiteSpaces($depth);
}
}
-
+
function toStringWithWhiteSpaces ($depth=0)
{
$attribString = '';
$elementName = $this->xname;
$spaces = $this->_spaceStr($depth) ;
-
+
$retString = "$spaces<$elementName";
-
-
+
+
foreach ($this->xattributes as $attrname => $attrvalue)
{
$attribString .= "$attrname=\"$attrvalue\" ";
}
-
-
+
+
if ($attribString)
{
$attribString = rtrim($attribString);
$retString .= " $attribString";
}
-
+
if (! $this->xnumChildren)
{
/* No kids -> no sub-elements, no text, nothing - consider a element */
$retString .= " />\n";
-
+
return $retString;
- }
-
-
-
+ }
+
+
+
/* If we've gotten this far, the element has
- ** kids or text - consider a otherstuff element
+ ** kids or text - consider a otherstuff element
*/
-
+
$onlyTxtChild = 0;
if ($this->xnumChildren == 1 && ! $this->xnumElementChildren)
{
$onlyTxtChild = 1;
}
-
-
-
+
+
+
if ($onlyTxtChild)
{
$nextDepth = 0;
@@ -1129,34 +1129,34 @@ class MiniXMLElement extends MiniXMLTree
$nextDepth = $depth+1;
$retString .= ">\n";
}
-
-
-
+
+
+
for ($i=0; $i < $this->xnumChildren ; $i++)
{
if (method_exists($this->xchildren[$i], 'toStringWithWhiteSpaces') )
{
-
+
$newStr = $this->xchildren[$i]->toStringWithWhiteSpaces($nextDepth);
-
-
+
+
if (! is_null($newStr))
{
if (! ( preg_match("/\n\$/", $newStr) || $onlyTxtChild) )
{
$newStr .= "\n";
}
-
+
$retString .= $newStr;
}
-
+
} else {
_MiniXMLLog("Invalid child found in $elementName ". $this->xchildren[$i]->name() );
-
+
} /* end if has a toString method */
-
+
} /* end loop over all children */
-
+
/* add the indented closing tag */
if ($onlyTxtChild)
{
@@ -1165,147 +1165,147 @@ class MiniXMLElement extends MiniXMLTree
$retString .= "$spaces\n";
}
return $retString;
-
+
} /* end method toString */
-
-
-
-
+
+
+
+
function toStringNoWhiteSpaces ()
{
$retString = '';
$attribString = '';
$elementName = $this->xname;
-
+
foreach ($this->xattributes as $attrname => $attrvalue)
{
$attribString .= "$attrname=\"$attrvalue\" ";
}
-
+
$retString = "<$elementName";
-
-
+
+
if ($attribString)
{
$attribString = rtrim($attribString);
$retString .= " $attribString";
}
-
+
if (! $this->xnumChildren)
{
/* No kids -> no sub-elements, no text, nothing - consider a element */
-
+
$retString .= " />";
return $retString;
}
-
-
+
+
/* If we've gotten this far, the element has
- ** kids or text - consider a otherstuff element
+ ** kids or text - consider a otherstuff element
*/
$retString .= ">";
-
+
/* Loop over all kids, getting associated strings */
for ($i=0; $i < $this->xnumChildren ; $i++)
{
if (method_exists($this->xchildren[$i], 'toStringNoWhiteSpaces') )
{
$newStr = $this->xchildren[$i]->toStringNoWhiteSpaces();
-
+
if (! is_null($newStr))
{
$retString .= $newStr;
}
-
+
} else {
_MiniXMLLog("Invalid child found in $elementName");
-
+
} /* end if has a toString method */
-
+
} /* end loop over all children */
-
+
/* add the indented closing tag */
$retString .= "";
-
+
return $retString;
-
+
} /* end method toStringNoWhiteSpaces */
-
-
+
+
/* toStructure
**
** Converts an element to a structure - either an array or a simple string.
- **
+ **
** This method is used by MiniXML documents to perform their toArray() magic.
*/
function & toStructure ()
{
-
+
$retHash = array();
$contents = "";
$numAdded = 0;
-
-
-
+
+
+
for($i=0; $i< $this->xnumChildren; $i++)
{
if ($this->isElement($this->xchildren[$i]))
{
$name = $this->xchildren[$i]->name();
-
+
if (array_key_exists($name, $retHash))
-
+
{
if (! (is_array($retHash[$name]) && array_key_exists('_num', $retHash[$name])) )
{
$retHash[$name] = array($retHash[$name],
$this->xchildren[$i]->toStructure());
-
+
$retHash[$name]['_num'] = 2;
} else {
array_push($retHash[$name], $this->xchildren[$i]->toStructure() );
-
+
$retHash[$name]['_num']++;
}
} else {
$retHash[$name] = $this->xchildren[$i]->toStructure();
}
-
+
$numAdded++;
} else {
$contents .= $this->xchildren[$i]->getValue();
}
-
-
+
+
}
-
-
+
+
foreach ($this->xattributes as $attrname => $attrvalue)
{
#array_push($retHash, array($attrname => $attrvalue));
$retHash["_attributes"][$attrname] = $attrvalue;
$numAdded++;
}
-
-
+
+
if ($numAdded)
{
if (! empty($contents))
{
$retHash['_content'] = $contents;
}
-
+
return $retHash;
} else {
return $contents;
}
-
+
} // end toStructure() method
-
-
-
-
-
+
+
+
+
+
/* isElement ELEMENT
** Returns a true value if ELEMENT is an instance of MiniXMLElement,
** false otherwise.
@@ -1318,11 +1318,11 @@ class MiniXMLElement extends MiniXMLTree
{
return 0;
}
-
+
return method_exists($testme, 'MiniXMLElement');
}
-
-
+
+
/* isNode NODE
** Returns a true value if NODE is an instance of MiniXMLNode,
** false otherwise.
@@ -1335,15 +1335,15 @@ class MiniXMLElement extends MiniXMLTree
{
return 0;
}
-
+
return method_exists($testme, 'MiniXMLNode');
}
-
-
+
+
/* createNode NODEVALUE [ESCAPEENTITIES]
**
** Private (?)
- **
+ **
** Creates a new MiniXMLNode instance and appends it to the list
** of this element's children.
** The new child node's value is set to NODEVALUE.
@@ -1356,15 +1356,12 @@ class MiniXMLElement extends MiniXMLTree
*/
function & createNode (&$value, $escapeEntities=NULL)
{
+
+ return $this->appendNode(new MiniXMLNode($value, $escapeEntities));
- $newNode = new MiniXMLNode($value, $escapeEntities);
-
- $appendedNode =& $this->appendNode($newNode);
-
- return $appendedNode;
}
-
-
+
+
/* appendNode CHILDNODE
**
** appendNode is used to append an existing MiniXMLNode object to
@@ -1382,40 +1379,44 @@ class MiniXMLElement extends MiniXMLTree
{
return _MiniXMLError("MiniXMLElement::appendNode() need to pass a non-NULL MiniXMLNode.");
}
-
-
- if (! method_exists($node, 'MiniXMLNode'))
+
+
+ if (! $node->isnode)
{
return _MiniXMLError("MiniXMLElement::appendNode() must pass a MiniXMLNode object to appendNode.");
}
-
+
if (MINIXML_AUTOSETPARENT)
{
if ($this->xparent == $node)
{
- return _MiniXMLError("MiniXMLElement::appendnode() Tryng to append parent $cname as node of "
+ return _MiniXMLError("MiniXMLElement::appendnode() Tryng to append parent $cname as node of "
. $this->xname );
}
$node->parent($this);
}
-
-
+
+
$idx = $this->xnumChildren++;
- $this->xchildren[$idx] = $node;
-
+ $this->xchildren[$idx] =& $node;
+
return $this->xchildren[$idx];
-
-
+
+
}
-
+
/* Destructor to keep things clean -- patch by Ilya */
function __destruct()
{
for ($i = 0; $i < count($this->xchildren); ++$i)
- $this->xchildren[$i]->xparent = null;
+ {
+ // $this->xchildren[$i]->xparent = NULL;
+ unset($this->xchildren[$i]);
+ }
+ unset($this->xchildren);
}
-
-
+
+
} /* end MiniXMLElement class definition */
@@ -1445,8 +1446,8 @@ class MiniXMLElementComment extends Mini
{
$this->MiniXMLElement('!--');
}
-
-
+
+
function toString ($depth=0)
{
if ($depth == MINIXML_NOWHITESPACES)
@@ -1456,66 +1457,66 @@ class MiniXMLElementComment extends Mini
return $this->toStringWithWhiteSpaces($depth);
}
}
-
-
+
+
function toStringWithWhiteSpaces ($depth=0)
{
$spaces = $this->_spaceStr($depth) ;
-
+
$retString = "$spaces\n";
-
+
return $retString;
}
-
+
/* If we get here, the element does have children... get their contents */
-
+
$nextDepth = $depth+1;
-
+
for ($i=0; $i < $this->xnumChildren ; $i++)
{
$retString .= $this->xchildren[$i]->toStringWithWhiteSpaces($nextDepth);
}
-
+
$retString .= "\n$spaces -->\n";
-
-
+
+
return $retString;
}
-
-
+
+
function toStringNoWhiteSpaces ()
{
$retString = '';
-
+
$retString = "";
return $retString;
}
-
-
+
+
/* If we get here, the element does have children... get their contents */
for ($i=0; $i < $this->xnumChildren ; $i++)
{
$retString .= $this->xchildren[$i]->toStringNoWhiteSpaces();
}
-
+
$retString .= " -->";
-
-
+
+
return $retString;
}
-
-
+
+
}
@@ -1539,30 +1540,30 @@ class MiniXMLElementComment extends Mini
class MiniXMLElementCData extends MiniXMLElement {
-
-
-
+
+
+
function MiniXMLElementCData ($contents)
{
-
+
$this->MiniXMLElement('CDATA');
if (! is_null($contents))
{
$this->createNode($contents, 0) ;
}
}
-
+
function toStringNoWhiteSpaces ()
{
return $this->toString(MINIXML_NOWHITESPACES);
}
-
+
function toStringWithWhiteSpaces ($depth=0)
{
return $this->toString($depth);
}
-
+
function toString ($depth=0)
{
$spaces = '';
@@ -1570,26 +1571,26 @@ class MiniXMLElementCData extends MiniXM
{
$spaces = $this->_spaceStr($depth);
}
-
+
$retString = "$spacesxnumChildren)
{
$retString .= "]]>\n";
return $retString;
}
-
+
for ( $i=0; $i < $this->xnumChildren; $i++)
{
$retString .= $this->xchildren[$i]->getValue();
-
+
}
-
+
$retString .= " ]]>\n";
-
+
return $retString;
}
-
+
}
@@ -1613,7 +1614,7 @@ class MiniXMLElementCData extends MiniXM
class MiniXMLElementDocType extends MiniXMLElement {
var $dtattr;
-
+
function MiniXMLElementDocType ($attr)
{
$this->MiniXMLElement('DOCTYPE');
@@ -1628,56 +1629,56 @@ class MiniXMLElementDocType extends Mini
return $this->toStringWithWhiteSpaces($depth);
}
}
-
-
+
+
function toStringWithWhiteSpaces ($depth=0)
{
$spaces = $this->_spaceStr($depth);
-
+
$retString = "$spacesdtattr . " [\n";
-
+
if (! $this->xnumChildren)
{
$retString .= "]>\n";
return $retString;
}
-
+
$nextDepth = $depth + 1;
-
+
for ( $i=0; $i < $this->xnumChildren; $i++)
{
-
+
$retString .= $this->xchildren[$i]->toStringWithWhiteSpaces($nextDepth);
-
+
}
-
+
$retString .= "\n$spaces]>\n";
-
+
return $retString;
}
function toStringNoWhiteSpaces ()
{
-
+
$retString = "dtattr . " [ ";
-
+
if (! $this->xnumChildren)
{
$retString .= "]>\n";
return $retString;
}
-
+
for ( $i=0; $i < $this->xnumChildren; $i++)
{
-
+
$retString .= $this->xchildren[$i]->toStringNoWhiteSpaces();
-
+
}
-
+
$retString .= " ]>\n";
-
+
return $retString;
}
@@ -1704,57 +1705,57 @@ class MiniXMLElementDocType extends Mini
class MiniXMLElementEntity extends MiniXMLElement {
-
+
function MiniXMLElementEntity ($name, $value=NULL)
{
-
+
$this->MiniXMLElement($name);
-
+
if (! is_null ($value))
{
$this->createNode($value, 0);
}
-
+
}
-
+
function toString ($depth = 0)
{
-
+
$spaces = '';
if ($depth != MINIXML_NOWHITESPACES)
{
$spaces = $this->_spaceStr($depth);
- }
-
+ }
+
$retString = "$spacesname();
-
+
if (! $this->xnumChildren)
{
$retString .= ">\n";
return $retString;
}
-
+
$nextDepth = ($depth == MINIXML_NOWHITESPACES) ? MINIXML_NOWHITESPACES
: $depth + 1;
$retString .= '"';
for ( $i=0; $i < $this->xnumChildren; $i++)
{
-
+
$retString .= $this->xchildren[$i]->toString(MINIXML_NOWHITESPACES);
-
+
}
$retString .= '"';
$retString .= " >\n";
-
+
return $retString;
}
-
-
+
+
function toStringNoWhiteSpaces ()
{
return $this->toString(MINIXML_NOWHITESPACES);
}
-
+
function toStringWithWhiteSpaces ($depth=0)
{
return $this->toString($depth);
Index: libraries/minixml/classes/node.inc.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/importexportapi/libraries/minixml/classes/node.inc.php,v
retrieving revision 1.1
diff -u -p -r1.1 node.inc.php
--- libraries/minixml/classes/node.inc.php 9 Jun 2006 16:43:28 -0000 1.1
+++ libraries/minixml/classes/node.inc.php 17 Apr 2009 02:09:04 -0000
@@ -12,31 +12,37 @@
****************************************************************************************************
*****
***** MiniXML - PHP class library for generating and parsing XML.
-*****
+*****
***** Copyright (C) 2002-2005 Patrick Deegan, Psychogenic.com
***** All rights reserved.
*****
-***** http://minixml.psychogenic.com
-*****
-***** This program is free software; you can redistribute
-***** it and/or modify it under the terms of the GNU
-***** General Public License as published by the Free
-***** Software Foundation; either version 2 of the
-***** License, or (at your option) any later version.
-*****
-***** This program is distributed in the hope that it will
-***** be useful, but WITHOUT ANY WARRANTY; without even
-***** the implied warranty of MERCHANTABILITY or FITNESS
-***** FOR A PARTICULAR PURPOSE. See the GNU General
-***** Public License for more details.
-*****
-***** You should have received a copy of the GNU General
-***** Public License along with this program; if not,
-***** write to the Free Software Foundation, Inc., 675
-***** Mass Ave, Cambridge, MA 02139, USA.
+***** http://minixml.psychogenic.com
*****
+*****
+***** This library is released under the terms of the GNU GPL version 3, making it available only for
+***** free programs ("free" here being used in the sense of the GPL, see http://www.gnu.org for more details).
+***** Anyone wishing to use this library within a proprietary or otherwise non-GPLed program MUST contact psychogenic.com to
+***** acquire a distinct license for their application. This approach encourages the use of free software
+***** while allowing for proprietary solutions that support further development.
+*****
+*****
+*****
+***** miniXML is free software: you can redistribute it and/or modify
+***** it under the terms of the GNU General Public License as published by
+***** the Free Software Foundation, either version 3 of the License, or
+***** (at your option) any later version.
+*****
+***** miniXML is distributed in the hope that it will be useful,
+***** but WITHOUT ANY WARRANTY; without even the implied warranty of
+***** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+***** GNU General Public License for more details.
+*****
+***** You should have received a copy of the GNU General Public License
+***** along with miniXML. If not, see .
+*****
+*****
*****
-***** You may contact the author, Pat Deegan, through the
+***** You may contact the author, Pat Deegan, through the
***** contact section at http://www.psychogenic.com
*****
***** Much more information on using this API can be found on the
@@ -67,10 +73,10 @@ require_once(MINIXML_CLASSDIR . "/treeco
** They have no name or children.
**
** They always exist as children of MiniXMLElements.
-** For example,
+** For example,
** this text is bold
** Would be represented as a MiniXMLElement named 'B' with a single
-** child, a MiniXMLNode object which contains the string 'this text
+** child, a MiniXMLNode object which contains the string 'this text
** is bold'.
**
** a MiniXMLNode has
@@ -79,10 +85,11 @@ require_once(MINIXML_CLASSDIR . "/treeco
*/
class MiniXMLNode extends MiniXMLTreeComponent {
-
-
+
+
var $xtext;
var $xnumeric;
+ var $xisnode;
/* MiniXMLNode [CONTENTS]
** Constructor. Creates a new MiniXMLNode object.
@@ -93,8 +100,9 @@ class MiniXMLNode extends MiniXMLTreeCom
$this->MiniXMLTreeComponent();
$this->xtext = NULL;
$this->xnumeric = NULL;
-
- /* If we were passed a value, save it as the
+ $this->isnode = 1;
+
+ /* If we were passed a value, save it as the
** appropriate type
*/
if (! is_null($value))
@@ -105,7 +113,7 @@ class MiniXMLNode extends MiniXMLTreeCom
{
_MiniXMLLog("Setting numeric value of node to '$value'");
}
-
+
$this->xnumeric = $value;
} else {
if (MINIXML_IGNOREWHITESPACES > 0)
@@ -113,33 +121,29 @@ class MiniXMLNode extends MiniXMLTreeCom
$value = trim($value);
$value = rtrim($value);
}
-
- if (! is_null($escapeEntities))
+
+ if ($escapeEntities || (MINIXML_AUTOESCAPE_ENTITIES > 0))
{
- if ($escapeEntities)
- {
- $value = htmlentities($value);
- }
- } elseif (MINIXML_AUTOESCAPE_ENTITIES > 0) {
$value = htmlentities($value);
+
}
-
+
if (MINIXML_DEBUG > 0)
{
_MiniXMLLog("Setting text value of node to '$value'");
}
-
+
$this->xtext = $value;
-
-
+
+
} /* end if value numeric */
-
+
} /* end if value passed */
-
+
} /* end MiniXMLNode constructor */
-
+
/* getValue
- **
+ **
** Returns the text or numeric value of this Node.
*/
function getValue ()
@@ -152,133 +156,133 @@ class MiniXMLNode extends MiniXMLTreeCom
{
$retStr = "$this->xnumeric";
}
-
+
if (MINIXML_DEBUG > 0)
{
_MiniXMLLog("MiniXMLNode::getValue returning '$retStr'");
}
-
+
return $retStr;
}
-
-
+
+
/* text [SETTO [SETTOALT]]
**
** The text() method is used to get or set text data for this node.
**
** If SETTO is passed, the node's content is set to the SETTO string.
**
- ** If the optional SETTOALT is passed and SETTO is false, the
- ** node's value is set to SETTOALT.
+ ** If the optional SETTOALT is passed and SETTO is false, the
+ ** node's value is set to SETTOALT.
**
- ** Returns this node's text, if set or NULL
+ ** Returns this node's text, if set or NULL
**
*/
function text ($setToPrimary = NULL, $setToAlternate=NULL)
{
$setTo = ($setToPrimary ? $setToPrimary : $setToAlternate);
-
+
if (! is_null($setTo))
{
- if (! is_null($this->xnumeric) )
+ if (! is_null($this->xnumeric) )
{
return _MiniXMLError("MiniXMLNode::text() Can't set text for element with numeric set.");
-
+
} elseif (! is_string($setTo) && ! is_numeric($setTo) ) {
-
+
return _MiniXMLError("MiniXMLNode::text() Must pass a STRING value to set text for element ('$setTo').");
}
-
+
if (MINIXML_IGNOREWHITESPACES > 0)
{
$setTo = trim($setTo);
$setTo = rtrim($setTo);
}
-
-
+
+
if (MINIXML_AUTOESCAPE_ENTITIES > 0)
{
$setTo = htmlentities($setTo);
- }
-
-
+ }
+
+
if (MINIXML_DEBUG > 0)
{
_MiniXMLLog("Setting text value of node to '$setTo'");
}
-
+
$this->xtext = $setTo;
-
+
}
-
+
return $this->xtext;
}
-
+
/* numeric [SETTO [SETTOALT]]
**
** The numeric() method is used to get or set numerical data for this node.
**
** If SETTO is passed, the node's content is set to the SETTO string.
**
- ** If the optional SETTOALT is passed and SETTO is NULL, the
- ** node's value is set to SETTOALT.
+ ** If the optional SETTOALT is passed and SETTO is NULL, the
+ ** node's value is set to SETTOALT.
**
- ** Returns this node's text, if set or NULL
+ ** Returns this node's text, if set or NULL
**
*/
function numeric ($setToPrim = NULL, $setToAlt = NULL)
{
$setTo = is_null($setToPrim) ? $setToAlt : $setToPrim;
-
+
if (! is_null($setTo))
{
if (! is_null($this->xtext)) {
-
+
return _MiniXMLError("MiniXMLElement::numeric() Can't set numeric for element with text.");
-
+
} elseif (! is_numeric($setTo))
{
return _MiniXMLError("MiniXMLElement::numeric() Must pass a NUMERIC value to set numeric for element.");
}
-
+
if (MINIXML_DEBUG > 0)
{
_MiniXMLLog("Setting numeric value of node to '$setTo'");
}
$this->xnumeric = $setTo;
}
-
+
return $this->xnumeric;
}
-
-
-
+
+
+
/* toString [DEPTH]
**
** Returns this node's contents as a string.
**
**
- ** Note: Nodes have only a single value, no children. It is
- ** therefore pointless to use the same toString() method split as
+ ** Note: Nodes have only a single value, no children. It is
+ ** therefore pointless to use the same toString() method split as
** in the MiniXMLElement class.
**
*/
-
+
function toString ($depth=0)
{
if ($depth == MINIXML_NOWHITESPACES)
{
return $this->toStringNoWhiteSpaces();
}
-
+
if (MINIXML_DEBUG > 0)
{
_MiniXMLLog("MiniXMLNode::toString() call with depth $depth");
}
-
+
$spaces = $this->_spaceStr($depth);
$retStr = $spaces;
-
+
if (! is_null($this->xtext) )
{
/* a text element */
@@ -286,28 +290,28 @@ class MiniXMLNode extends MiniXMLTreeCom
} elseif (! is_null($this->xnumeric)) {
/* a numeric element */
$retStr .= $this->xnumeric;
- }
-
+ }
+
/* indent all parts of the string correctly */
$retStr = preg_replace("/\n\s*/sm", "\n$spaces", $retStr);
-
+
return $retStr;
}
-
-
+
+
function toStringWithWhiteSpaces ($depth=0)
{
return $this->toString($depth);
}
-
+
function toStringNoWhiteSpaces ()
{
-
+
if (MINIXML_DEBUG > 0)
{
_MiniXMLLog("MiniXMLNode::toStringNoWhiteSpaces() call with depth $depth");
}
-
+
if (! is_null($this->xtext) )
{
/* a text element */
@@ -316,13 +320,11 @@ class MiniXMLNode extends MiniXMLTreeCom
/* a numeric element */
$retStr = $this->xnumeric;
}
-
+
return $retStr;
}
-
-
+
+
} /* end class definition */
-
-
?>
Index: libraries/minixml/classes/treecomp.inc.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/importexportapi/libraries/minixml/classes/treecomp.inc.php,v
retrieving revision 1.1
diff -u -p -r1.1 treecomp.inc.php
--- libraries/minixml/classes/treecomp.inc.php 9 Jun 2006 16:43:28 -0000 1.1
+++ libraries/minixml/classes/treecomp.inc.php 17 Apr 2009 02:09:04 -0000
@@ -11,31 +11,36 @@
****************************************************************************************************
*****
***** MiniXML - PHP class library for generating and parsing XML.
-*****
+*****
***** Copyright (C) 2002-2005 Patrick Deegan, Psychogenic.com
***** All rights reserved.
*****
-***** http://minixml.psychogenic.com
-*****
-***** This program is free software; you can redistribute
-***** it and/or modify it under the terms of the GNU
-***** General Public License as published by the Free
-***** Software Foundation; either version 2 of the
-***** License, or (at your option) any later version.
-*****
-***** This program is distributed in the hope that it will
-***** be useful, but WITHOUT ANY WARRANTY; without even
-***** the implied warranty of MERCHANTABILITY or FITNESS
-***** FOR A PARTICULAR PURPOSE. See the GNU General
-***** Public License for more details.
-*****
-***** You should have received a copy of the GNU General
-***** Public License along with this program; if not,
-***** write to the Free Software Foundation, Inc., 675
-***** Mass Ave, Cambridge, MA 02139, USA.
-*****
+***** http://minixml.psychogenic.com
*****
-***** You may contact the author, Pat Deegan, through the
+*****
+***** This library is released under the terms of the GNU GPL version 3, making it available only for
+***** free programs ("free" here being used in the sense of the GPL, see http://www.gnu.org for more details).
+***** Anyone wishing to use this library within a proprietary or otherwise non-GPLed program MUST contact psychogenic.com to
+***** acquire a distinct license for their application. This approach encourages the use of free software
+***** while allowing for proprietary solutions that support further development.
+*****
+*****
+*****
+***** miniXML is free software: you can redistribute it and/or modify
+***** it under the terms of the GNU General Public License as published by
+***** the Free Software Foundation, either version 3 of the License, or
+***** (at your option) any later version.
+*****
+***** miniXML is distributed in the hope that it will be useful,
+***** but WITHOUT ANY WARRANTY; without even the implied warranty of
+***** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+***** GNU General Public License for more details.
+*****
+***** You should have received a copy of the GNU General Public License
+***** along with miniXML. If not, see .
+*****
+*****
+***** You may contact the author, Pat Deegan, through the
***** contact section at http://www.psychogenic.com
*****
***** Much more information on using this API can be found on the
@@ -57,14 +62,14 @@
-/* MiniXMLTreeComponent class
+/* MiniXMLTreeComponent class
** This class is only to be used as a base class
** for others.
**
** It presents the minimal interface we can expect
** from any component in the XML hierarchy.
**
-** All methods of this base class
+** All methods of this base class
** simply return NULL except a little default functionality
** included in the parent() method.
**
@@ -74,39 +79,39 @@
*/
class MiniXMLTreeComponent {
-
+
var $xparent;
-
+
/* MiniXMLTreeComponent
** Constructor. Creates a new MiniXMLTreeComponent object.
**
*/
function MiniXMLTreeComponent ()
{
- $this->xparent = NULL;
+ // $this->xparent = NULL;
} /* end MiniXMLTreeComponent constructor */
-
-
+
+
/* Get set function for the element name
*/
function name ($setTo=NULL)
{
return NULL;
}
-
+
/* Function to fetch an element */
function & getElement ($name)
{
- return NULL;
+ return _MiniXMLReturnNullByRef();
}
-
- /* Function that returns the value of this
+
+ /* Function that returns the value of this
component and its children */
function getValue ()
{
return NULL;
}
-
+
/* parent NEWPARENT
**
** The parent() method is used to get/set the element's parent.
@@ -117,7 +122,7 @@ class MiniXMLTreeComponent {
** Returns a reference to the parent MiniXMLTreeComponent if set, NULL otherwise.
*/
function &parent (&$setParent)
- {
+ {
if (! is_null($setParent))
{
/* Parents can only be MiniXMLElement objects */
@@ -128,12 +133,12 @@ class MiniXMLTreeComponent {
}
$this->xparent = $setParent;
}
-
+
return $this->xparent;
-
-
+
+
}
-
+
/* Return a stringified version of the XML representing
this component and all sub-components */
function toString ($depth=0)
@@ -149,7 +154,7 @@ class MiniXMLTreeComponent {
{
return var_dump($this);
}
-
+
/* helper class that everybody loves */
function _spaceStr ($numSpaces)
{
@@ -158,23 +163,22 @@ class MiniXMLTreeComponent {
{
return $retStr;
}
-
+
for($i = 1; $i < $numSpaces; $i++)
{
$retStr .= str_repeat(' ', MINIXML_INDENT_SIZE);
}
-
+
return $retStr;
}
-
+
/* Destructor to keep things clean -- patch by Ilya */
function __destruct()
{
$this->xparent = null;
}
-
+
} /* end class definition */
?>
-
Index: ui/importexportui.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/importexportapi/ui/importexportui.info,v
retrieving revision 1.4
diff -u -p -r1.4 importexportui.info
--- ui/importexportui.info 25 Mar 2007 21:21:47 -0000 1.4
+++ ui/importexportui.info 17 Apr 2009 02:09:04 -0000
@@ -2,4 +2,5 @@
name = Import Export UI
description = Provides a user interface for importing and exporting data in a Drupal site. Requires the importexportapi module.
package = Import Export API
-dependencies = importexportapi
+dependencies[] = importexportapi
+core = 6.x
Index: ui/importexportui.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/importexportapi/ui/importexportui.module,v
retrieving revision 1.12
diff -u -p -r1.12 importexportui.module
--- ui/importexportui.module 25 Mar 2007 21:21:47 -0000 1.12
+++ ui/importexportui.module 17 Apr 2009 02:09:04 -0000
@@ -9,19 +9,19 @@
/**
* Implementation of hook_help().
*/
-function importexportui_help($section) {
+function importexportui_help($path, $arg) {
$op = '';
- if (strpos($section, 'admin/build/import') !== FALSE) {
- $section = 'admin/build/import';
+ if (strpos($path, 'admin/build/import') !== FALSE) {
+ $path = 'admin/build/import';
$op = 'import';
}
- elseif (strpos($section, 'admin/build/export') !== FALSE) {
- $section = 'admin/build/export';
+ elseif (strpos($path, 'admin/build/export') !== FALSE) {
+ $path = 'admin/build/export';
$op = 'export';
}
- switch ($section) {
+ switch ($path) {
case 'admin/help#importexportui':
return t('The import / export UI module provides a user interface for importing and exporting data in a Drupal site in a variety of formats. It requires the importexportapi module, which it relies on for performing all of the actual work of executing import and export operations.');
@@ -33,7 +33,6 @@ function importexportui_help($section) {
if (!empty($entities)) {
$page = 'field mappings';
}
-
return _importexportui_get_help_message($page, $op);
}
}
@@ -41,25 +40,22 @@ function importexportui_help($section) {
/**
* Implementation of hook_menu().
*/
-function importexportui_menu($may_cache) {
- $items = array();
+function importexportui_menu() {
+ $items['admin/build/export'] = array(
+ 'title' => 'Export',
+ 'description' => 'Create a user interface for exporting data from the site.',
+ 'page callback' => 'importexportui_page',
+ 'page arguments' => array('export'),
+ 'access arguments' => array('perform data exports')
+ );
- if ($may_cache) {
- $items[] = array(
- 'path' => 'admin/build/export',
- 'title' => t('Export'),
- 'callback' => 'importexportui_page',
- 'callback arguments' => array('export'),
- 'access' => user_access('perform data exports')
- );
- $items[] = array(
- 'path' => 'admin/build/import',
- 'title' => t('Import'),
- 'callback' => 'importexportui_page',
- 'callback arguments' => array('import'),
- 'access' => user_access('perform data imports')
- );
- }
+ $items['admin/build/import'] = array(
+ 'title' => 'Import',
+ 'description' => 'Create a user interface for importing data to the site.',
+ 'page callback' => 'importexportui_page',
+ 'page arguments' => array('import'),
+ 'access arguments' => array('perform data imports')
+ );
return $items;
}
@@ -87,9 +83,9 @@ function importexportui_page($op, $entit
* The initial selection form that the user is presented with on the import and
* export pages.
*/
-function importexportui_initial_selection_form($op) {
- $form = array();
+function importexportui_initial_selection_form(&$form_state, $op) {
+ $form = array();
$form['entities'] = array(
'#type' => 'checkboxes',
'#title' => t('Entities to @op', array('@op' => $op)),
@@ -116,27 +112,28 @@ function importexportui_initial_selectio
/**
* Redirects the user from the initial selection form to the mapping form page.
*/
-function importexportui_initial_selection_form_submit($form_id, $form_values) {
+function importexportui_initial_selection_form_submit($form, &$form_state) {
$entities = NULL;
$engine = NULL;
$op = arg(2);
- if (!empty($form_values['entities'])) {
- $entities = implode(',', array_filter($form_values['entities']));
+ if (!empty($form_state['values']['entities'])) {
+ $entities = implode(',', array_filter($form_state['values']['entities']));
}
- if (!empty($form_values['engine'])) {
- $engine = $form_values['engine'];
+ if (!empty($form_state['values']['engine'])) {
+ $engine = $form_state['values']['engine'];
}
if (!empty($entities) && !empty($engine)) {
- return 'admin/build/'. $op .'/'. $entities .'/'. $engine;
+ $form_state['redirect'] = 'admin/build/'. $op .'/'. $entities .'/'. $engine;
+ $form_state['nid'] = $node->nid;
}
}
/**
* Displays the field mappings form.
*/
-function importexportui_mapping_form($op, $entity_list, $engine) {
+function importexportui_mapping_form(&$form_state, $op, $entity_list, $engine) {
$form = array();
$def = importexportapi_get_def(NULL, TRUE);
$type = ($op == 'export' ? 'put' : 'get');
@@ -295,26 +292,28 @@ function _importexportui_mapping_form(&$
* 'back'), or processes the user's custom-defined field mappings, and then
* executes the import or export operation.
*/
-function importexportui_mapping_form_submit($form_id, $form_values) {
- $op = isset($form_values['op']) ? $form_values['op'] : NULL;
+function importexportui_mapping_form_submit($form, &$form_state) {
+ $op = isset($form_state['values']['op']) ? $form_state['values']['op'] : NULL;
if (!empty($op) && $op == t('Back (initial selection)')) {
- return 'admin/build/'. $form_values['ie_op'];
+ $form_state['redirect'] = 'admin/build/'. $form_state['values']['ie_op'];
+ $form_state['nid'] = $node->nid;
+ exit();
}
- _importexportui_set_mappings($form_values);
+ _importexportui_set_mappings($form_state);
- $function = 'importexportui_do_'. $form_values['ie_op'];
+ $function = 'importexportui_do_'. $form_state['values']['ie_op'];
if (isset($op) && function_exists($function)) {
- $function($form_values);
+ $function($form_state);
}
drupal_page_footer();
exit();
}
-function importexportui_export_form($entity_list, $engine) {
+function importexportui_export_form(&$form_state, $entity_list, $engine) {
timer_start('importexportui');
$data = importexportapi_get_data($entity_list);
$ret = importexportapi_put_data($data, $engine);
@@ -360,40 +359,39 @@ function importexportui_export_form($ent
/**
* Performs an export operation, and outputs the results in a themed page.
*/
-function importexportui_do_export($form_values) {
- $output .= drupal_get_form('importexportui_export_form', $form_values['entity_list'], $form_values['engine']);
- $output .= _importexportui_view_links($form_values['ie_op']);
+function importexportui_do_export($form_state) {
+ $output .= drupal_get_form('importexportui_export_form', $form_state['values']['entity_list'], $form_state['values']['engine']);
+ $output .= _importexportui_view_links($form_state['values']['ie_op']);
print theme('page', $output);
}
/**
* Performs an import operation, and outputs the results in a themed page.
*/
-function importexportui_do_import($form_values) {
- $entity_list = $form_values['entity_list'];
- $engine = $form_values['engine'];
+function importexportui_do_import($form_state) {
+ $entity_list = $form_state['values']['entity_list'];
+ $engine = $form_state['values']['engine'];
$raw = NULL;
if ($engine == 'xml') {
- $raw = _importexportui_get_raw_data($form_values['raw']);
+ $raw = _importexportui_get_raw_data($form_state['values']['raw']);
}
elseif ($engine == 'csv') {
$raw = array();
- $raw_list = $form_values['raw_list'];
+ $raw_list = $form_state['values']['raw_list'];
foreach ($raw_list as $raw_item) {
- if (!empty($form_values['raw_'. $raw_item['id']])) {
- $raw[$raw_item['csv_plural']] = _importexportui_get_raw_data($form_values['raw_'. $raw_item['id']]);
+ if (!empty($form_state['values']['raw_'. $raw_item['id']])) {
+ $raw[$raw_item['csv_plural']] = _importexportui_get_raw_data($form_state['values']['raw_'. $raw_item['id']]);
}
}
}
-
$data = importexportapi_get_data($entity_list, $engine, array('raw' => $raw));
$ret = importexportapi_put_data($data, NULL, array('put_id' => 1));
$output = ''. check_plain("$ret") .'
';;
- $output .= _importexportui_view_links($form_values['ie_op']);
+ $output .= _importexportui_view_links($form_state['values']['ie_op']);
print theme('page', $output);
}
@@ -474,21 +472,21 @@ function _importexportui_get_format_list
/**
* Processes the custom-defined field mappings, as entered by the user.
*/
-function _importexportui_set_mappings($form_values) {
+function _importexportui_set_mappings($form_state) {
$def = importexportapi_get_def();
- $entity_list = $form_values['entity_list'];
- $type = $form_values['ie_type'];
- $engine = $form_values['engine'];
+ $entity_list = $form_state['values']['entity_list'];
+ $type = $form_state['values']['ie_type'];
+ $engine = $form_state['values']['engine'];
foreach ($entity_list as $entity_id) {
$values = array();
- if (!empty($form_values[$entity_id .'_plural'])) {
- $values["#$type"]['#'. $engine .'_plural'] = $form_values[$entity_id .'_plural'];
+ if (!empty($form_state['values'][$entity_id .'_plural'])) {
+ $values["#$type"]['#'. $engine .'_plural'] = $form_state['values'][$entity_id .'_plural'];
}
- if (!empty($form_values[$entity_id .'_mapping'])) {
- $values["#$type"]['#'. $engine .'_mapping'] = $form_values[$entity_id .'_mapping'];
+ if (!empty($form_state['values'][$entity_id .'_mapping'])) {
+ $values["#$type"]['#'. $engine .'_mapping'] = $form_state['values'][$entity_id .'_mapping'];
}
if (!empty($values)) {
@@ -496,7 +494,7 @@ function _importexportui_set_mappings($f
}
$field_ids = element_children($def[$entity_id]);
- $child_fields = isset($form_values[$entity_id .'_fields']) ? $form_values[$entity_id .'_fields'] : NULL;
+ $child_fields = isset($form_state['values'][$entity_id .'_fields']) ? $form_state['values'][$entity_id .'_fields'] : NULL;
if (!empty($field_ids) && !empty($child_fields)) {
_importexportui_set_mappings_recurse($def[$entity_id], $field_ids, $child_fields, $type, $engine);
@@ -507,15 +505,15 @@ function _importexportui_set_mappings($f
/**
* Recursively processes custom-defined field mappings.
*/
-function _importexportui_set_mappings_recurse($entity, $field_ids, $form_values, $type, $engine) {
+function _importexportui_set_mappings_recurse($entity, $field_ids, $form_state, $type, $engine) {
foreach ($field_ids as $field_id) {
$values = array();
- if (!empty($form_values[$field_id .'_plural'])) {
- $values["#$type"]['#'. $engine .'_plural'] = $form_values[$field_id .'_plural'];
+ if (!empty($form_state['values'][$field_id .'_plural'])) {
+ $values["#$type"]['#'. $engine .'_plural'] = $form_state['values'][$field_id .'_plural'];
}
- if (!empty($form_values[$field_id .'_mapping'])) {
- $values["#$type"]['#'. $engine .'_mapping'] = $form_values[$field_id .'_mapping'];
+ if (!empty($form_state['values'][$field_id .'_mapping'])) {
+ $values["#$type"]['#'. $engine .'_mapping'] = $form_state['values'][$field_id .'_mapping'];
}
if (!empty($values)) {
@@ -524,7 +522,7 @@ function _importexportui_set_mappings_re
}
$child_ids = element_children($entity[$field_id]);
- $child_fields = isset($form_values[$field_id .'_fields']) ? $form_values[$field_id .'_fields'] : NULL;
+ $child_fields = isset($form_state['values'][$field_id .'_fields']) ? $form_state['values'][$field_id .'_fields'] : NULL;
if (!empty($child_ids) && !empty($child_fields)) {
_importexportui_set_mappings_recurse($entity[$field_id], $child_ids, $child_fields, $type, $engine);