Author: jablko
Date: Thu Oct 28 01:12:57 2010
New Revision: 8613
Log:
Cosmetic change
Modified:
trunk/apps/qubit/modules/digitalobject/actions/imageflowComponent.class.php
trunk/apps/qubit/modules/digitalobject/actions/showAudioComponent.class.php
trunk/apps/qubit/modules/digitalobject/actions/showDownloadComponent.class.php
trunk/apps/qubit/modules/digitalobject/actions/showImageComponent.class.php
trunk/apps/qubit/modules/digitalobject/actions/showTextComponent.class.php
trunk/apps/qubit/modules/digitalobject/actions/showVideoComponent.class.php
trunk/lib/SearchIndex.class.php
trunk/lib/model/QubitDigitalObject.php
Modified:
trunk/apps/qubit/modules/digitalobject/actions/imageflowComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/imageflowComponent.class.php
Thu Oct 28 01:09:07 2010 (r8612)
+++ trunk/apps/qubit/modules/digitalobject/actions/imageflowComponent.class.php
Thu Oct 28 01:12:57 2010 (r8613)
@@ -46,7 +46,7 @@
if (!$thumbnail)
{
- $thumbnail =
QubitDigitalObject::getGenericRepresentation($digitalObject->getMimeType(),
QubitTerm::THUMBNAIL_ID);
+ $thumbnail =
QubitDigitalObject::getGenericRepresentation($digitalObject->mimeType,
QubitTerm::THUMBNAIL_ID);
$thumbnail->setParent($digitalObject);
}
Modified:
trunk/apps/qubit/modules/digitalobject/actions/showAudioComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/showAudioComponent.class.php
Thu Oct 28 01:09:07 2010 (r8612)
+++ trunk/apps/qubit/modules/digitalobject/actions/showAudioComponent.class.php
Thu Oct 28 01:12:57 2010 (r8613)
@@ -56,7 +56,7 @@
{
$this->showFlashPlayer = false;
- $this->representation =
QubitDigitalObject::getGenericRepresentation($this->digitalObject->getMimeType(),
$this->usageType);
+ $this->representation =
QubitDigitalObject::getGenericRepresentation($this->digitalObject->mimeType,
$this->usageType);
}
}
}
Modified:
trunk/apps/qubit/modules/digitalobject/actions/showDownloadComponent.class.php
==============================================================================
---
trunk/apps/qubit/modules/digitalobject/actions/showDownloadComponent.class.php
Thu Oct 28 01:09:07 2010 (r8612)
+++
trunk/apps/qubit/modules/digitalobject/actions/showDownloadComponent.class.php
Thu Oct 28 01:12:57 2010 (r8613)
@@ -45,13 +45,13 @@
break;
case QubitTerm::MASTER_ID:
default:
- $this->representation =
QubitDigitalObject::getGenericRepresentation($this->digitalObject->getMimeType(),
$this->usageType);
+ $this->representation =
QubitDigitalObject::getGenericRepresentation($this->digitalObject->mimeType,
$this->usageType);
}
// If no representation found, then default to generic rep
if (!$this->representation)
{
- $this->representation =
QubitDigitalObject::getGenericRepresentation($this->digitalObject->getMimeType(),
$this->usageType);
+ $this->representation =
QubitDigitalObject::getGenericRepresentation($this->digitalObject->mimeType,
$this->usageType);
}
// Build a fully qualified URL to this digital object asset
Modified:
trunk/apps/qubit/modules/digitalobject/actions/showImageComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/showImageComponent.class.php
Thu Oct 28 01:09:07 2010 (r8612)
+++ trunk/apps/qubit/modules/digitalobject/actions/showImageComponent.class.php
Thu Oct 28 01:12:57 2010 (r8613)
@@ -47,7 +47,7 @@
// If representation is not a valid digital object, return a generic icon
if (!$this->representation)
{
- $this->representation =
QubitDigitalObject::getGenericRepresentation($this->digitalObject->getMimeType(),
$this->usageType);
+ $this->representation =
QubitDigitalObject::getGenericRepresentation($this->digitalObject->mimeType,
$this->usageType);
}
}
}
Modified:
trunk/apps/qubit/modules/digitalobject/actions/showTextComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/showTextComponent.class.php
Thu Oct 28 01:09:07 2010 (r8612)
+++ trunk/apps/qubit/modules/digitalobject/actions/showTextComponent.class.php
Thu Oct 28 01:12:57 2010 (r8613)
@@ -47,7 +47,7 @@
// If representation is not a valid digital object, return a generic icon
if (!$this->representation)
{
- $this->representation =
QubitDigitalObject::getGenericRepresentation($this->digitalObject->getMimeType(),
$this->usageType);
+ $this->representation =
QubitDigitalObject::getGenericRepresentation($this->digitalObject->mimeType,
$this->usageType);
}
}
}
Modified:
trunk/apps/qubit/modules/digitalobject/actions/showVideoComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/showVideoComponent.class.php
Thu Oct 28 01:09:07 2010 (r8612)
+++ trunk/apps/qubit/modules/digitalobject/actions/showVideoComponent.class.php
Thu Oct 28 01:12:57 2010 (r8613)
@@ -67,7 +67,7 @@
else
{
$this->showFlashPlayer = false;
- $this->representation =
QubitDigitalObject::getGenericRepresentation($this->digitalObject->getMimeType(),
$this->usageType);
+ $this->representation =
QubitDigitalObject::getGenericRepresentation($this->digitalObject->mimeType,
$this->usageType);
}
}
}
Modified: trunk/lib/SearchIndex.class.php
==============================================================================
--- trunk/lib/SearchIndex.class.php Thu Oct 28 01:09:07 2010 (r8612)
+++ trunk/lib/SearchIndex.class.php Thu Oct 28 01:12:57 2010 (r8613)
@@ -398,7 +398,7 @@
}
$doc->addField(Zend_Search_Lucene_Field::Unstored('filename',
$digitalObject->getName(), $encoding));
- $doc->addField(Zend_Search_Lucene_Field::Unstored('mimetype',
$digitalObject->getMimeType(), $encoding));
+ $doc->addField(Zend_Search_Lucene_Field::Unstored('mimetype',
$digitalObject->mimeType, $encoding));
}
// exclude control area fields for now, maybe add a seperate index for
administrative data?
Modified: trunk/lib/model/QubitDigitalObject.php
==============================================================================
--- trunk/lib/model/QubitDigitalObject.php Thu Oct 28 01:09:07 2010
(r8612)
+++ trunk/lib/model/QubitDigitalObject.php Thu Oct 28 01:12:57 2010
(r8613)
@@ -436,7 +436,7 @@
$cleanFileName = self::sanitizeFilename($asset->getName());
// If file has not extension, try to get it from asset mime type
- if (0 == strlen(pathinfo($cleanFileName, PATHINFO_EXTENSION)) && null !==
($assetMimeType = $asset->getMimeType()) && 0 < strlen(($newFileExtension =
array_search($assetMimeType, self::$qubitMimeTypes))))
+ if (0 == strlen(pathinfo($cleanFileName, PATHINFO_EXTENSION)) && null !==
($assetMimeType = $asset->mimeType) && 0 < strlen(($newFileExtension =
array_search($assetMimeType, self::$qubitMimeTypes))))
{
$cleanFileName .= '.'.$newFileExtension;
}
@@ -600,7 +600,7 @@
*/
public function isWebCompatibleImageFormat()
{
- return in_array($this->getMimeType(), self::$webCompatibleImageFormats);
+ return in_array($this->mimeType, self::$webCompatibleImageFormats);
}
/**
@@ -630,12 +630,12 @@
public function setDefaultMediaType()
{
// Make sure we have a valid mime-type (with a forward-slash).
- if (!strlen($this->getMimeType()) || !strpos($this->getMimeType(), '/'))
+ if (!strlen($this->mimeType) || !strpos($this->mimeType, '/'))
{
return null;
}
- $mimePieces = explode('/', $this->getMimeType());
+ $mimePieces = explode('/', $this->mimeType);
switch($mimePieces[0])
{
@@ -1434,7 +1434,7 @@
*/
public function canThumbnail()
{
- return self::canThumbnailMimeType($this->getMimeType());
+ return self::canThumbnailMimeType($this->mimeType);
}
/**
--
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.
