aboutsummaryrefslogtreecommitdiff
path: root/classes/iterators
diff options
context:
space:
mode:
authorSilvio <silvio@devlet.com.br>2010-07-19 14:44:05 -0300
committerSilvio <silvio@devlet.com.br>2010-07-19 14:44:05 -0300
commit5f0e3d2f891e433f2f0aec1222df6c71eb7cdb62 (patch)
treedbb22693d6de0531bcc81e311da42529cad4ee3f /classes/iterators
parent4bc6c646b13f6172a0b8df309b5bce7b30d0d67f (diff)
downloadcinisis-5f0e3d2f891e433f2f0aec1222df6c71eb7cdb62.tar.gz
cinisis-5f0e3d2f891e433f2f0aec1222df6c71eb7cdb62.tar.bz2
Renaming Iterators
Diffstat (limited to 'classes/iterators')
-rw-r--r--classes/iterators/IsisFieldIterator.php61
-rw-r--r--classes/iterators/IsisMainFieldIterator.php82
-rw-r--r--classes/iterators/IsisSubfieldIterator.php82
3 files changed, 115 insertions, 110 deletions
diff --git a/classes/iterators/IsisFieldIterator.php b/classes/iterators/IsisFieldIterator.php
index 11ed979..09f4867 100644
--- a/classes/iterators/IsisFieldIterator.php
+++ b/classes/iterators/IsisFieldIterator.php
@@ -1,14 +1,19 @@
<?php
/**
- * Isis field iterator. Iterates over all field values for
- * each result row.
+ * Isis field iterator. Iterates over a field for each result row.
+ *
+ * @todo
+ * Support for 'join_subfields'
*/
class IsisFieldIterator implements Iterator
{
- private $valueset;
- private $row = 0;
- private $rows = 0;
+ private $keys;
+ private $fieldset;
+ private $row = 0;
+ private $rows = 0;
+ private $subfield = 0;
+ private $subfields = 0;
/**
* Constructor.
@@ -18,18 +23,29 @@ class IsisFieldIterator implements Iterator
*
* @param $field
* Field to iterate over.
+ *
+ * @param $main
+ * Control to which subfield the main field should be mapped to.
+ * By default no mapping is made.
+ *
+ * @todo
+ * Implement $main mapping.
*/
- public function __construct($class, $field) {
- $this->rows = $class->getRows($field);
- $this->valueset = $class->getValues($field);
+ public function __construct($class, $field, $main = false) {
+ $this->class = $class;
+ $this->field = $field;
+ $this->rows = $class->getRows($field);
+ $this->fieldset = $class->getSubfieldList($field);
+ $this->keys = array_keys($this->fieldset);
+ $this->subfields = count($this->keys);
}
/**
* Rewind the Iterator to the first element.
*/
function rewind() {
- $this->row = 0;
- $this->value = 0;
+ $this->row = 0;
+ $this->subfield = 0;
}
/**
@@ -43,37 +59,26 @@ class IsisFieldIterator implements Iterator
* Return the current element.
*/
function current() {
- return $this->valueset[$this->row]['field'];
+ return $this->fieldset[$this->keys[$this->subfield]];
}
/**
* Move forward to next element.
*/
function next() {
- do {
+ if ($this->subfield >= $this->subfields) {
+ $this->subfield = 0;
++$this->row;
}
- while ($this->current_null() && $this->has_more_rows());
- }
-
- /**
- * Check if there are more rows.
- */
- function has_more_rows() {
- return $this->row <= $this->rows;
- }
-
- /**
- * Check if the current value is null.
- */
- function current_null() {
- return $this->current() == NULL;
+ else {
+ ++$this->subfield;
+ }
}
/**
* Check if there is a current element after calls to rewind() or next().
*/
function valid() {
- return $this->has_more_rows() && !$this->current_null();
+ return $this->row <= $this->rows;
}
}
diff --git a/classes/iterators/IsisMainFieldIterator.php b/classes/iterators/IsisMainFieldIterator.php
new file mode 100644
index 0000000..68430b8
--- /dev/null
+++ b/classes/iterators/IsisMainFieldIterator.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * Isis field iterator. Iterates over all field main values for
+ * each result row.
+ *
+ * @todo
+ * Support for 'join_subfields'
+ */
+class IsisMainFieldIterator implements Iterator
+{
+ private $valueset;
+ private $row = 0;
+ private $rows = 0;
+
+ /**
+ * Constructor.
+ *
+ * @param $class
+ * Instance of IsisConnector or child class.
+ *
+ * @param $field
+ * Field to iterate over.
+ */
+ public function __construct($class, $field) {
+ $this->rows = $class->getRows($field);
+ $this->valueset = $class->getValues($field);
+ }
+
+ /**
+ * Rewind the Iterator to the first element.
+ */
+ function rewind() {
+ $this->row = 0;
+ $this->value = 0;
+ }
+
+ /**
+ * Return the key of the current element.
+ */
+ function key() {
+ return $this->row;
+ }
+
+ /**
+ * Return the current element.
+ */
+ function current() {
+ return $this->valueset[$this->row]['field'];
+ }
+
+ /**
+ * Move forward to next element.
+ */
+ function next() {
+ do {
+ ++$this->row;
+ }
+ while ($this->current_null() && $this->has_more_rows());
+ }
+
+ /**
+ * Check if there are more rows.
+ */
+ function has_more_rows() {
+ return $this->row <= $this->rows;
+ }
+
+ /**
+ * Check if the current value is null.
+ */
+ function current_null() {
+ return $this->current() == NULL;
+ }
+
+ /**
+ * Check if there is a current element after calls to rewind() or next().
+ */
+ function valid() {
+ return $this->has_more_rows() && !$this->current_null();
+ }
+}
diff --git a/classes/iterators/IsisSubfieldIterator.php b/classes/iterators/IsisSubfieldIterator.php
deleted file mode 100644
index 7e01687..0000000
--- a/classes/iterators/IsisSubfieldIterator.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * Isis subfield iterator. Iterates over all subfields for
- * each result row.
- */
-class IsisSubfieldIterator implements Iterator
-{
- private $keys;
- private $fieldset;
- private $row = 0;
- private $rows = 0;
- private $subfield = 0;
- private $subfields = 0;
-
- /**
- * Constructor.
- *
- * @param $class
- * Instance of IsisConnector or child class.
- *
- * @param $field
- * Field to iterate over.
- *
- * @param $main
- * Control to which subfield the main field should be mapped to.
- * By default no mapping is made.
- *
- * @todo
- * Implement $main mapping.
- */
- public function __construct($class, $field, $main = false) {
- $this->class = $class;
- $this->field = $field;
- $this->rows = $class->getRows($field);
- $this->fieldset = $class->getSubfieldList($field);
- $this->keys = array_keys($this->fieldset);
- $this->subfields = count($this->keys);
- }
-
- /**
- * Rewind the Iterator to the first element.
- */
- function rewind() {
- $this->row = 0;
- $this->subfield = 0;
- }
-
- /**
- * Return the key of the current element.
- */
- function key() {
- return $this->row;
- }
-
- /**
- * Return the current element.
- */
- function current() {
- return $this->fieldset[$this->keys[$this->subfield]];
- }
-
- /**
- * Move forward to next element.
- */
- function next() {
- if ($this->subfield >= $this->subfields) {
- $this->subfield = 0;
- ++$this->row;
- }
- else {
- ++$this->subfield;
- }
- }
-
- /**
- * Check if there is a current element after calls to rewind() or next().
- */
- function valid() {
- return $this->row <= $this->rows;
- }
-}