SlatePermutate Changeset - dcc324bd004e · protofusion repositories

Changeset - dcc324bd004e

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 14 years ago 2012-02-12 22:42:14
ohnobinki@ohnopublishing.net

Fix some form parsing functions in the crawler API.

1 file changed with 16 insertions and 12 deletions:

inc/school.crawl.inc

0 comments (0 inline, 0 general)

inc/school.crawl.inc

➞

Show inline comments

@@ @@ -463,122 +463,126 @@ function school_crawl_element_ancestor(D @@
   if (!strcmp($node->tagName, $element_name))
     return $node;
   if ($node->parentNode)
     return school_crawl_element_ancestor($node->parentNode, $element_name);
   return NULL;
+}
 /**
  * \brief
  *   Create an array based on an HTML form for submitting the form.
+ *
  * Currently, this will only support the <input /> and <select />
  * elements.
+ *
  * \param $form_node
  *   The dom node of the form.
  * \return
  *   An array suitable for passing to school_crawl_geturi().
  */
 function school_crawl_form(DOMElement $form_node)
+{
   $form = array();
   $xpath = new DOMXPath($form_node->ownerDocument);
   foreach ($xpath->query('input', $form_node) as $input_node)
+  foreach ($xpath->query('.//input', $form_node) as $input_node)
+    {
       if ($input_node->hasAttribute('name'))
+	{
 	  /*
 	   * Skip over checkboxes which are not ``successful''
 	   * (http://w3.org/ terminology).
 	   */
 	  if (!strcasecmp($input_node->getAttribute('type'), 'checkbox')
 	      && !$input_node->hasAttribute('checked'))
 	    continue;
 	  $input_name = $input_node->getAttribute('name');
 	  if (!isset($form[$input_name]))
 	    $form[$input_name] = array();
 	  if ($input_node->hasAttribute('value'))
 	    $form[$input_name][] = $input_node->getAttribute('value');
 	  else
 	    /* not sure about what best to do in this case... */
 	    $form[$input_name][] = '';
+	}
+    }
   foreach ($xpath->query('select', $form_node) as $select_node)
+  foreach ($xpath->query('.//select', $form_node) as $select_node)
+    {
       if ($select_node->hasAttribute('name'))
+	{
 	  $select_name = $select_node->getAttribute('name');
 	  if (!isset($form[$select_name]))
 	    $form[$select_name] = array();
 	  foreach ($xpath->query('option[selected]', $select_node) as $option_node)
+	  foreach ($xpath->query('.//option[@selected]', $select_node) as $option_node)
 	    if ($option_node->hasAttribute('value'))
 	      $form[$select_name][] = $option_node->getAttribute('value');
+	}
+    }
   return $form;
+}
 /**
  * \brief
  *   Parses a <select />'s <option />s into an associative array.
+ *
  * \param $select
  *   The DOMElement representing the <select />.
  * \param $get_textcontent
  *   Whether or not the returned array should point at DOMElements or
  *   at the textcontent of each <option /> node. Defaults to
  *   textcontent.
  * \param $selected
  *   Will be set to an array of the currently selected keys if passed.
  * \return
  *   An associative array mapping an <option />'s name attribute onto
  *   either the <option />'s textcontent (if $get_textcontent is TRUE)
  *   or onto the <option /> DOMElement itself.
  *   An associative array mapping an <option />'s value attribute onto
  *   an array of different <option />s' textcontent (if
  *   $get_textcontent is TRUE) or onto the <option />s' DOMElements
  *   themselves.
  */
 function school_crawl_form_select_array(DOMElement $select, $get_textcontent = TRUE, &$selected = NULL)
+{
   $selected = array();
   $options = array();
   $name = $select->getAttribute('name');
   foreach ($select->childNodes as $child_node)
     if ($child_node->nodeType == XML_ELEMENT_NODE
 	&& !strcasecmp($child_node->tagName, 'options')
 	&& $child_node->hasAttribute('name'))
 	&& !strcasecmp($child_node->tagName, 'option')
 	&& $child_node->hasAttribute('value'))
+      {
-	$name = $child_node->getAttribute('name');
+	$value = $child_node->getAttribute('value');
 	if ($child_node->hasAttribute('selected'))
-	  $selected[] = $name;
+	  $selected[] = $value;
 	if (empty($options[$value]))
 	  $options[$value] = array();
 	if ($get_textcontent)
-	  $options[$name] = $child_node->textContent;
+	  $options[$value][] = $child_node->textContent;
 	else
-	  $options[$name] = $child_node;
+	  $options[$value][] = $child_node;
+      }
   return $options;
+}
 /**
  * \brief
  *   Resolve a relativish URL.
+ *
  * \param $orig_url
  *   The original URL.
  * \param $url
  *   The new URL to be reconciled with the original one.
  * \return
  *   A string, the new URL.
  */
 function school_crawl_url($orig_url, $url)
+{
   /*
    * This accounts for both if the $url is already an absolute, fully
    * qualified URL. It falls back to the original URL if it fails to
    * match.
    */
   foreach (array($url, $orig_url) as $aurl)

0 comments (0 inline, 0 general)