hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 23:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove binary adapters

Browse Source
This commit is contained in:
Romain Neutron
2012-04-25 13:33:15 +02:00
parent 0896b2073a
commit 97b635e6b4
1 changed files with 1339 additions and 1341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/classes/databox.class.php
View File

@@ -91,15 +91,12 @@ class databox extends base
protected static $_instances = array(); protected static $_instances = array();
const BASE_TYPE = self::DATA_BOX; const BASE_TYPE = self::DATA_BOX;
const CACHE_META_STRUCT = 'meta_struct'; const CACHE_META_STRUCT = 'meta_struct';
const CACHE_THESAURUS = 'thesaurus'; const CACHE_THESAURUS = 'thesaurus';
const CACHE_COLLECTIONS = 'collections'; const CACHE_COLLECTIONS = 'collections';
const CACHE_STRUCTURE = 'structure'; const CACHE_STRUCTURE = 'structure';
const PIC_PDF = 'logopdf'; const PIC_PDF = 'logopdf';
protected $cache; protected $cache;
protected $connection; protected $connection;
protected $registry; protected $registry;
@@ -451,7 +448,6 @@ class databox extends base
$stmt->closeCursor(); $stmt->closeCursor();
if ($row) if ($row)
return self::get_instance((int) $row['sbas_id']); return self::get_instance((int) $row['sbas_id']);
try try
@@ -576,8 +572,9 @@ class databox extends base
public function get_meta_structure() public function get_meta_structure()
{ {
if ($this->meta_struct) if ($this->meta_struct)
{
return $this->meta_struct; return $this->meta_struct;
}
try try
{ {
@@ -626,7 +623,9 @@ class databox extends base
public function get_subdef_structure() public function get_subdef_structure()
{ {
if ( ! $this->subdef_struct) if ( ! $this->subdef_struct)
{
$this->subdef_struct = new databox_subdefsStructure($this); $this->subdef_struct = new databox_subdefsStructure($this);
}
return $this->subdef_struct; return $this->subdef_struct;
} }
@@ -649,7 +648,7 @@ class databox extends base
$day = date('d', strtotime($date)); $day = date('d', strtotime($date));
$n = 0; $n = 0;
$comp = $year . '/' . $month . '/' . $day . '/'; $comp = $year . DIRECTORY_SEPARATOR . $month . DIRECTORY_SEPARATOR . $day . DIRECTORY_SEPARATOR;
$condition = true; $condition = true;
@@ -659,8 +658,11 @@ class databox extends base
{ {
$n ++; $n ++;
} }
if ( ! is_dir($pathout)) if ( ! is_dir($pathout))
{
system_file::mkdir($pathout); system_file::mkdir($pathout);
}
return p4string::addEndSlash($pathout); return p4string::addEndSlash($pathout);
@@ -699,7 +701,6 @@ class databox extends base
} }
} }
if ($n > $limit) if ($n > $limit)
return true; return true;
return false; return false;
@@ -1216,7 +1217,6 @@ class databox extends base
public function get_structure() public function get_structure()
{ {
if ($this->structure) if ($this->structure)
return $this->structure; return $this->structure;
$this->structure = $this->retrieve_structure(); $this->structure = $this->retrieve_structure();
@@ -1257,7 +1257,6 @@ class databox extends base
public function get_cterms() public function get_cterms()
{ {
if ($this->cterms) if ($this->cterms)
return $this->cterms; return $this->cterms;
$sql = "SELECT value FROM pref WHERE prop='cterms'"; $sql = "SELECT value FROM pref WHERE prop='cterms'";
@@ -1424,7 +1423,6 @@ class databox extends base
public function get_cgus() public function get_cgus()
{ {
if ($this->cgus) if ($this->cgus)
return $this->cgus; return $this->cgus;
$this->load_cgus(); $this->load_cgus();