Author: mcantelon
Date: Tue Apr 3 11:57:03 2012
New Revision: 11353
Log:
Got rid of now unused column auditing functions.
Modified:
trunk/lib/QubitFlatfileImport.class.php
Modified: trunk/lib/QubitFlatfileImport.class.php
==============================================================================
--- trunk/lib/QubitFlatfileImport.class.php Tue Apr 3 11:46:30 2012
(r11352)
+++ trunk/lib/QubitFlatfileImport.class.php Tue Apr 3 11:57:03 2012
(r11353)
@@ -800,128 +800,6 @@
/*
*
- * Import auditing methods
- * -----------------------
- */
-
- /**
- * Return an array of columns that are handled by import logic
- *
- * @return array array of column names
- */
- public function handledOrIgnoredColumns()
- {
- return $this->combineArraysWithoutDuplicates(
- $this->standardColumns,
- $this->variableColumns,
- $this->ignoreColumns,
- array_keys($this->columnMap),
- array_keys($this->handlers),
- array_keys($this->propertyMap),
- array_keys($this->noteMap),
- array_keys($this->arrayColumns)
- );
- }
-
- /**
- * Determine whether columns isn't handled by import logic
- *
- * @return boolean TRUE if column not handled by import logic
- */
- public function unhandledColumn($column)
- {
- return !in_array($column, $this->handledOrIgnoredColumns());
- }
-
- /**
- * Return an array of import columns that aren't handled by import logic
- *
- * @return array array of column names
- */
- public function determineUnmatchedHandledColumns()
- {
- $unmatchedColumns = array();
-
- foreach($this->handledOrIgnoredColumns() as $handledColumn)
- {
- if (!in_array($handledColumn, $this->columnNames))
array_push($unmatchedColumns, $handledColumn);
- }
-
- return $unmatchedColumns;
- }
-
- /**
- * Return an array of columns that are included in the import but not
- * handled by logic.
- *
- * @return array array of column names
- */
- public function determineUnhandledColumns()
- {
- $ignored = array();
- foreach($this->columnNames as $column)
- {
- if ($this->unhandledColumn($column))
- {
- array_push($ignored, $column);
- }
- }
-
- return $ignored;
- }
-
- /**
- * Render a string description of problem columns from an array
- *
- * @return string description
- */
- public function renderProblemColumns($columns, $problemDescription)
- {
- $output = '';
-
- if (count($columns))
- {
- $output .= count($columns) . " columns ". $problemDescription .":\n";
- $output .= ' '. implode("\n ", $columns) ."\n";
-
- $output .= "\n";
- }
-
- return $output;
- }
-
- /**
- * Render a string description of import columns that aren't handled by
- * the import logic
- *
- * @return string description
- */
- public function renderUnhandledColumns()
- {
- return $this->renderProblemColumns(
- $this->determineUnhandledColumns(),
- "aren't handled or ignored"
- );
- }
-
- /**
- * Render a string description of columns that are handled by the import
- * logic but don't actually exist in the import itself
- *
- * @return string description
- */
- public function renderUnmatchedColumns()
- {
- return $this->renderProblemColumns(
- $this->determineUnmatchedHandledColumns(),
- 'are being handled or ignored but do not have an import column to work
with'
- );
- return $output;
- }
-
-
- /*
- *
* Qubit data helpers
* ------------------
*/
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.