Author: sevein
Date: Tue Aug 7 13:57:13 2012
New Revision: 12050
Log:
Cosmetic change: s/TRUE/true, s/FALSE/false
Modified:
trunk/lib/QubitCsvTransform.class.php
trunk/lib/QubitCsvTransformFactory.class.php
trunk/lib/QubitSocket.class.php
trunk/lib/QubitXmlImport.class.php
trunk/lib/task/import/csvAccessionImportTask.class.php
trunk/lib/task/import/csvAuthorityRecordImportTask.class.php
trunk/lib/task/import/csvCheckImportTask.class.php
trunk/lib/task/import/csvEventImportTask.class.php
trunk/lib/task/import/csvImportBaseTask.class.php
trunk/lib/task/import/csvImportTask.class.php
Modified: trunk/lib/QubitCsvTransform.class.php
==============================================================================
--- trunk/lib/QubitCsvTransform.class.php Tue Aug 7 13:53:14 2012
(r12049)
+++ trunk/lib/QubitCsvTransform.class.php Tue Aug 7 13:57:13 2012
(r12050)
@@ -20,7 +20,7 @@
{
if (
!isset($options['skipOptionsAndEnvironmentCheck'])
- || $options['skipOptionsAndEnvironmentCheck'] == FALSE
+ || $options['skipOptionsAndEnvironmentCheck'] == false
)
{
$this->checkTaskOptionsAndEnvironment($options['options']);
@@ -47,7 +47,7 @@
$this->status['ignoreBadLod'] = $cliOptions['ignore-bad-lod'];
}
- $this->status['headersWritten'] = FALSE;
+ $this->status['headersWritten'] = false;
}
protected function checkTaskOptionsAndEnvironment($options)
@@ -68,7 +68,7 @@
if (!$this->status['headersWritten'])
{
fputcsv($this->status['outFh'], $this->columnNames);
- $this->status['headersWritten'] = TRUE;
+ $this->status['headersWritten'] = true;
}
}
Modified: trunk/lib/QubitCsvTransformFactory.class.php
==============================================================================
--- trunk/lib/QubitCsvTransformFactory.class.php Tue Aug 7 13:53:14
2012 (r12049)
+++ trunk/lib/QubitCsvTransformFactory.class.php Tue Aug 7 13:57:13
2012 (r12050)
@@ -91,7 +91,7 @@
$stage2 = new QubitCsvTransform(array(
- 'skipOptionsAndEnvironmentCheck' => TRUE,
+ 'skipOptionsAndEnvironmentCheck' => true,
'status' => array(
'finalOutputFile' => $self->status['finalOutputFile'],
Modified: trunk/lib/QubitSocket.class.php
==============================================================================
--- trunk/lib/QubitSocket.class.php Tue Aug 7 13:53:14 2012 (r12049)
+++ trunk/lib/QubitSocket.class.php Tue Aug 7 13:57:13 2012 (r12050)
@@ -224,6 +224,6 @@
curl_close($this->sock);
unlink($filePath);
- return ($error_no == 0); //TRUE if communication okay
+ return ($error_no == 0); //true if communication okay
}
}
Modified: trunk/lib/QubitXmlImport.class.php
==============================================================================
--- trunk/lib/QubitXmlImport.class.php Tue Aug 7 13:53:14 2012 (r12049)
+++ trunk/lib/QubitXmlImport.class.php Tue Aug 7 13:57:13 2012 (r12050)
@@ -455,7 +455,7 @@
$err_level = error_reporting(0);
$doc = new DOMDocument('1.0', 'UTF-8');
- // Default $strictXmlParsing to FALSE
+ // Default $strictXmlParsing to false
$strictXmlParsing = (isset($options['strictXmlParsing'])) ?
$options['strictXmlParsing'] : false;
if ($strictXmlParsing)
Modified: trunk/lib/task/import/csvAccessionImportTask.class.php
==============================================================================
--- trunk/lib/task/import/csvAccessionImportTask.class.php Tue Aug 7
13:53:14 2012 (r12049)
+++ trunk/lib/task/import/csvAccessionImportTask.class.php Tue Aug 7
13:57:13 2012 (r12050)
@@ -156,7 +156,7 @@
print 'Found '. $result->id ."\n";
$self->object = QubitAccession::getById($result->id);
} else {
- $self->object = FALSE;
+ $self->object = false;
$error = "Couldn't find accession # ". $accessionNumber .'...
creating.';
print $error ."\n";
$self->object = new QubitAccession();
Modified: trunk/lib/task/import/csvAuthorityRecordImportTask.class.php
==============================================================================
--- trunk/lib/task/import/csvAuthorityRecordImportTask.class.php Tue Aug
7 13:53:14 2012 (r12049)
+++ trunk/lib/task/import/csvAuthorityRecordImportTask.class.php Tue Aug
7 13:57:13 2012 (r12050)
@@ -246,12 +246,12 @@
'region'
);
- $hasContactInfo = FALSE;
+ $hasContactInfo = false;
foreach(array_keys($self->rowStatusVars) as $name)
{
if (in_array($name, $contactVariables))
{
- $hasContactInfo = TRUE;
+ $hasContactInfo = true;
}
}
Modified: trunk/lib/task/import/csvCheckImportTask.class.php
==============================================================================
--- trunk/lib/task/import/csvCheckImportTask.class.php Tue Aug 7 13:53:14
2012 (r12049)
+++ trunk/lib/task/import/csvCheckImportTask.class.php Tue Aug 7 13:57:13
2012 (r12050)
@@ -66,7 +66,7 @@
'nonEmptyColumns' => $nonEmptyColumns,
'sampleColumnValues' => $sampleColumnValues,
'multiValueColumns' => array(),
- 'sampleOnlyMultivalueColumns' => FALSE,
+ 'sampleOnlyMultivalueColumns' => false,
'numberOfSampleValues' => 1
),
@@ -85,7 +85,7 @@
// check if column isn't empty
if (trim($value))
{
- $self->status['nonEmptyColumns'][$column] = TRUE;
+ $self->status['nonEmptyColumns'][$column] = true;
if ($self->status['numberOfSampleValues'] > 0
&& (
Modified: trunk/lib/task/import/csvEventImportTask.class.php
==============================================================================
--- trunk/lib/task/import/csvEventImportTask.class.php Tue Aug 7 13:53:14
2012 (r12049)
+++ trunk/lib/task/import/csvEventImportTask.class.php Tue Aug 7 13:57:13
2012 (r12050)
@@ -58,7 +58,7 @@
$sourceName = ($options['source-name'])
? $options['source-name']
- : FALSE;
+ : false;
if (false === $fh = fopen($arguments['filename'], 'rb'))
{
@@ -99,7 +99,7 @@
'objectValueColumn' => $objectValueColumn,
'objectIdColumn' => $objectIdColumn,
'relationTypeColumn' => $relationTypeColumn,
- 'dataCached' => FALSE,
+ 'dataCached' => false,
'subjectKeys' => array(),
'objectKeys' => array(),
'goodSubjects' => 0,
@@ -124,7 +124,7 @@
$whereClause = ($self->status['sourceName'] &&
$self->status['objectTable'] == 'keymap')
? 'source_name = "'. $self->status['sourceName'] .'"'
- : FALSE;
+ : false;
$self->status['objectKeys'] = getNameIdArrayFromTable(
$self,
@@ -134,12 +134,12 @@
$whereClause
);
- $self->status['dataCached'] = TRUE;
+ $self->status['dataCached'] = true;
}
// attempt to use pre-cached actor ID
$subjectKey =
trim($self->columnValue($self->status['subjectValueColumn']));
- $subjectId = FALSE;
+ $subjectId = false;
if ($subjectKey)
{
if (isset($self->status['subjectKeys'][$subjectKey]))
@@ -161,7 +161,7 @@
$self->status['goodSubjects']++;
$objectKey =
trim($self->columnValue($self->status['objectValueColumn']));
- $objectId = FALSE;
+ $objectId = false;
if ($objectKey)
{
if (isset($self->status['objectKeys'][$objectKey]))
@@ -218,7 +218,7 @@
}
}
-function getNameIdArrayFromTable(&$self, $tableName, $keyColumn, $idColumn,
$whereClause = FALSE)
+function getNameIdArrayFromTable(&$self, $tableName, $keyColumn, $idColumn,
$whereClause = false)
{
$names = array();
Modified: trunk/lib/task/import/csvImportBaseTask.class.php
==============================================================================
--- trunk/lib/task/import/csvImportBaseTask.class.php Tue Aug 7 13:53:14
2012 (r12049)
+++ trunk/lib/task/import/csvImportBaseTask.class.php Tue Aug 7 13:57:13
2012 (r12050)
@@ -91,8 +91,8 @@
{
foreach($this->getOptions() as $option)
{
- if ($name == $option->getName()) return TRUE;
+ if ($name == $option->getName()) return true;
}
- return FALSE;
+ return false;
}
}
Modified: trunk/lib/task/import/csvImportTask.class.php
==============================================================================
--- trunk/lib/task/import/csvImportTask.class.php Tue Aug 7 13:53:14
2012 (r12049)
+++ trunk/lib/task/import/csvImportTask.class.php Tue Aug 7 13:57:13
2012 (r12050)
@@ -540,7 +540,7 @@
$index = 0;
foreach($self->rowStatusVars[$columnName] as $subject)
{
- $scope = FALSE;
+ $scope = false;
if
(isset($self->rowStatusVars['subjectAccessPointScopes'][$index]))
{
$scope =
$self->rowStatusVars['subjectAccessPointScopes'][$index];
@@ -675,7 +675,7 @@
{
case 'under copyright':
print "Adding rights for ". $self->object->title ."...\n";
- $rightsHolderId = FALSE;
+ $rightsHolderId = false;
$rightsHolderNames = explode('|',
$self->rowStatusVars['copyrightHolder']);
if ($self->rowStatusVars['copyrightExpires'])
@@ -818,8 +818,8 @@
);
// handle each of the event-related columns
- $eventType = FALSE;
- $place = FALSE;
+ $eventType = false;
+ $place = false;
foreach($eventColumns as $column => $definition)
{
if (isset($self->rowStatusVars[$column]))
--
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.
