diff --git a/composer.lock b/composer.lock
index 60aa9a8a8c..6e0aad09b6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -110,34 +110,29 @@
"alias-version": "1.0.9999999.9999999-dev"
},
{
- "package": "silex/silex",
+ "package": "pimple/pimple",
"version": "dev-master",
- "source-reference": "24244da60407eff5d08dd5c460a7d23285be6995",
+ "source-reference": "v1.0.0",
"alias-pretty-version": "1.0.x-dev",
"alias-version": "1.0.9999999.9999999-dev"
},
{
"package": "silex/silex",
"version": "dev-master",
- "source-reference": "a0a78aff64ee5e9d218643646fcf819d4a626804"
+ "source-reference": "6dcb25872210c50292516683ba541c1b29624afd",
+ "alias-pretty-version": "1.0.x-dev",
+ "alias-version": "1.0.9999999.9999999-dev"
},
{
"package": "silex/silex",
"version": "dev-master",
- "source-reference": "a0a78aff64ee5e9d218643646fcf819d4a626804",
- "alias-pretty-version": "1.0.x-dev",
- "alias-version": "1.0.9999999.9999999-dev"
+ "source-reference": "6dcb25872210c50292516683ba541c1b29624afd"
},
{
"package": "swftools/swftools",
"version": "dev-master",
"source-reference": "9e7668636baf3ef6c833d3bbd44ba17d4a062942"
},
- {
- "package": "swiftmailer/swiftmailer",
- "version": "dev-master",
- "source-reference": "9895567cec5a13d1a43db5053defbaad260c1b87"
- },
{
"package": "swiftmailer/swiftmailer",
"version": "dev-master",
@@ -148,26 +143,17 @@
{
"package": "swiftmailer/swiftmailer",
"version": "dev-master",
- "source-reference": "57789082d1d53529dcf8cd3ca132d9787a59afee",
- "alias-pretty-version": "4.1.x-dev",
- "alias-version": "4.1.9999999.9999999-dev"
+ "source-reference": "9895567cec5a13d1a43db5053defbaad260c1b87"
},
{
"package": "symfony/symfony",
"version": "dev-master",
- "source-reference": "ea33d4d377bacd6804ab9c304dbbd70cfc5d2860",
- "alias-pretty-version": "2.1.x-dev",
- "alias-version": "2.1.9999999.9999999-dev"
+ "source-reference": "e0238071d4f07b46a07177066b6dd74ffb50fa5f"
},
{
"package": "symfony/symfony",
"version": "dev-master",
- "source-reference": "ea33d4d377bacd6804ab9c304dbbd70cfc5d2860"
- },
- {
- "package": "symfony/symfony",
- "version": "dev-master",
- "source-reference": "1e15f2109633723b710e87184643cad88004b1b9",
+ "source-reference": "e0238071d4f07b46a07177066b6dd74ffb50fa5f",
"alias-pretty-version": "2.1.x-dev",
"alias-version": "2.1.9999999.9999999-dev"
},
@@ -186,13 +172,6 @@
"version": "dev-master",
"source-reference": "0fa26d642994630b2ec19c090149fa56ce84c789"
},
- {
- "package": "twig/twig",
- "version": "dev-master",
- "source-reference": "875fa010ce597edf97c04ce6490be950068e9372",
- "alias-pretty-version": "1.8.x-dev",
- "alias-version": "1.8.9999999.9999999-dev"
- },
{
"package": "twig/twig",
"version": "dev-master",
diff --git a/hudson/fixtures.sql b/hudson/fixtures.sql
index fd545ae6b4..46eeebca23 100644
--- a/hudson/fixtures.sql
+++ b/hudson/fixtures.sql
@@ -743,7 +743,7 @@ CREATE TABLE `cache` (
LOCK TABLES `cache` WRITE;
/*!40000 ALTER TABLE `cache` DISABLE KEYS */;
-INSERT INTO `cache` VALUES (3,3,3,'2012-04-27 00:06:55','2012-04-27 02:06:56','\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0db_test\0localhost\0\0\0\0\0\0\0� \0\0\0\0\0\0root\0\0\0\0toor\0\0\0\0db_test\0\n\n /tmp/db_test/documents\n \n \n \n /tmp/db_test/subdefs\n 800\n resample\n 72\n no\n 75\n yes\n \n image\n \n \n \n \n /tmp/db_test/subdefs\n 200\n resample\n 72\n yes\n 75\n no\n image\n web//db_test/subdefs\n \n \n \n \n \n \n /tmp/db_test/subdefs\n 800\n video\n yes\n \n libfaac\n libx264\n 1000\n 8\n 15\n \n \n \n \n /tmp/db_test/subdefs\n 200\n gif\n 500\n no\n web//db_test/subdefs\n \n \n \n \n /tmp/db_test/subdefs\n 200\n image\n no\n web//db_test/subdefs\n \n \n \n \n \n \n /tmp/db_test/subdefs\n audio\n yes\n \n \n \n \n \n /tmp/db_test/subdefs\n image\n no\n web//db_test/subdefs\n \n \n \n \n \n \n /tmp/db_test/subdefs\n flexpaper\n no\n \n \n \n \n \n /tmp/db_test/subdefs\n image\n resample\n 72\n 200\n no\n web//db_test/subdefs\n \n \n \n \n \n \n /tmp/db_test/subdefs\n image\n 200\n no\n resample\n 72\n \n \n \n \n \n /tmp/db_test/subdefs\n image\n no\n resample\n 72\n web//db_test/subdefs\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n Online\n \n\n\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0test\0\0\0\0\n \n 0\n \n \n \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0coll2\0\0\0\n \n 0\n \n \n \0\0\0','a:1:{i:0;i:0;}','Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:12.0) Gecko/20100101 Firefox/12.0','127.0.0.1','Apple','Firefox','12.0','1280x800','','0000-00-00 00:00:00',NULL,NULL);
+INSERT INTO `cache` VALUES (3,3,3,'2012-04-27 00:06:55','2012-04-27 02:06:56','\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0db_test\0localhost\0\0\0\0\0\0\0� \0\0\0\0\0\0root\0\0\0\0toor\0\0\0\0db_test\0\n\n /tmp/db_test/documents\n \n \n \n /tmp/db_test/subdefs\n 800\n resample\n 72\n no\n 75\n yes\n \n image\n \n \n \n \n /tmp/db_test/subdefs\n 200\n resample\n 72\n yes\n 75\n no\n image\n web//db_test/subdefs\n \n \n \n \n \n \n /tmp/db_test/subdefs\n 800\n video\n yes\n \n libfaac\n libx264\n 1000\n 8\n 15\n \n \n \n \n /tmp/db_test/subdefs\n 200\n gif\n 500\n no\n web//db_test/subdefs\n \n \n \n \n /tmp/db_test/subdefs\n 200\n image\n no\n web//db_test/subdefs\n \n \n \n \n \n \n /tmp/db_test/subdefs\n audio\n yes\n \n \n \n \n \n /tmp/db_test/subdefs\n image\n no\n web//db_test/subdefs\n \n \n \n \n \n \n /tmp/db_test/subdefs\n flexpaper\n no\n \n \n \n \n \n /tmp/db_test/subdefs\n image\n resample\n 72\n 200\n no\n web//db_test/subdefs\n \n \n \n \n \n \n /tmp/db_test/subdefs\n image\n 200\n no\n resample\n 72\n \n \n \n \n \n /tmp/db_test/subdefs\n image\n no\n resample\n 72\n web//db_test/subdefs\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n Online\n \n\n\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0test\0\0\0\0\n \n 0\n \n \n \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0coll2\0\0\0\n \n 0\n \n \n \0\0\0','a:1:{i:0;i:0;}','Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:12.0) Gecko/20100101 Firefox/12.0','127.0.0.1','Apple','Firefox','12.0','1280x800','','0000-00-00 00:00:00',NULL,NULL);
/*!40000 ALTER TABLE `cache` ENABLE KEYS */;
UNLOCK TABLES;
@@ -2174,7 +2174,7 @@ CREATE TABLE `metadatas_structure` (
LOCK TABLES `metadatas_structure` WRITE;
/*!40000 ALTER TABLE `metadatas_structure` DISABLE KEYS */;
-INSERT INTO `metadatas_structure` VALUES (1,'Object','IPTC:ObjectName',0,0,0,1,'string','','','0',0,1,0,NULL,NULL,0),(2,'Category','IPTC:Category',0,0,0,1,'string','','','0',0,1,1,NULL,NULL,0),(3,'SupplCategory','IPTC:SupplementalCategories',0,0,0,1,'string','','','0',0,1,2,NULL,NULL,0),(4,'Keywords','IPTC:Keywords',0,0,0,1,'string','',';','0',1,1,3,NULL,NULL,0),(5,'SpecialInstruct','IPTC:SpecialInstructions',0,0,0,1,'string','','','0',0,1,4,NULL,NULL,0),(6,'Date','IPTC:DateCreated',0,0,0,1,'date','','','0',0,1,5,NULL,NULL,0),(7,'Byline','IPTC:By-line',0,0,0,1,'string','','','0',0,1,6,NULL,NULL,0),(8,'BylineTitle','IPTC:By-lineTitle',0,0,0,1,'string','','','0',0,1,7,NULL,NULL,0),(9,'City','IPTC:City',0,0,0,1,'string','','','0',0,1,8,NULL,NULL,0),(10,'Province','IPTC:Province-State',0,0,0,1,'string','','','0',0,1,9,NULL,NULL,0),(11,'Country','IPTC:Country-PrimaryLocationName',0,0,0,1,'string','','','0',0,1,10,NULL,NULL,0),(12,'OriginalRef','IPTC:OriginalTransmissionReference',0,0,0,1,'string','','','0',0,1,11,NULL,NULL,0),(13,'Headline','IPTC:Headline',0,0,0,1,'string','','','0',0,1,12,NULL,NULL,0),(14,'Credit','IPTC:Credit',0,0,0,1,'string','','','0',0,1,13,NULL,NULL,0),(15,'Source','IPTC:Source',0,0,0,1,'string','','','0',0,1,14,NULL,NULL,0),(16,'Caption','IPTC:Caption-Abstract',0,0,0,1,'string','','','0',0,1,15,NULL,NULL,0),(17,'CaptionWriter','IPTC:Writer-Editor',0,0,0,1,'string','','','0',0,1,16,NULL,NULL,0),(18,'Longitude','GPS:GPSLongitude',1,0,0,1,'string','','','0',0,1,17,NULL,NULL,0),(19,'Latitude','GPS:GPSLatitude',1,0,0,1,'string','','','0',0,1,18,NULL,NULL,0),(20,'CameraModel','IFD0:Model',1,0,0,1,'string','','','0',0,1,19,NULL,NULL,0),(21,'FileName','PHRASEANET:tf-filename',1,0,0,1,'text','','','0',0,1,20,NULL,NULL,0),(22,'FilePath','PHRASEANET:tf-filepath',1,0,0,1,'text','','','0',0,1,21,NULL,NULL,0),(23,'Recordid','PHRASEANET:tf-recordid',1,0,0,1,'number','','','0',0,1,22,NULL,NULL,0),(24,'MimeType','PHRASEANET:tf-mimetype',1,0,0,1,'text','','','0',0,1,23,NULL,NULL,0),(25,'Size','PHRASEANET:tf-size',1,0,0,1,'number','','','0',0,1,24,NULL,NULL,0),(26,'Extension','PHRASEANET:tf-extension',1,0,0,1,'text','','','0',0,1,25,NULL,NULL,0),(27,'Width','PHRASEANET:tf-width',1,0,0,1,'number','','','0',0,1,26,NULL,NULL,0),(28,'Height','PHRASEANET:tf-height',1,0,0,1,'number','','','0',0,1,27,NULL,NULL,0),(29,'Bits','PHRASEANET:tf-bits',1,0,0,1,'number','','','0',0,1,28,NULL,NULL,0),(30,'Channels','PHRASEANET:tf-channels',1,0,0,1,'number','','','0',0,1,29,NULL,NULL,0);
+INSERT INTO `metadatas_structure` VALUES (1,'Object','IPTC:ObjectName',0,0,0,1,'string','','','0',0,1,0,NULL,NULL,0),(2,'Category','IPTC:Category',0,0,0,1,'string','','','0',0,1,1,NULL,NULL,0),(3,'SupplCategory','IPTC:SupplementalCategories',0,0,0,1,'string','','','0',0,1,2,NULL,NULL,0),(4,'Keywords','IPTC:Keywords',0,0,0,1,'string','',';','0',1,1,3,NULL,NULL,0),(5,'SpecialInstruct','IPTC:SpecialInstructions',0,0,0,1,'string','','','0',0,1,4,NULL,NULL,0),(6,'Date','IPTC:DateCreated',0,0,0,1,'date','','','0',0,1,5,NULL,NULL,0),(7,'Byline','IPTC:By-line',0,0,0,1,'string','','','0',0,1,6,NULL,NULL,0),(8,'BylineTitle','IPTC:By-lineTitle',0,0,0,1,'string','','','0',0,1,7,NULL,NULL,0),(9,'City','IPTC:City',0,0,0,1,'string','','','0',0,1,8,NULL,NULL,0),(10,'Province','IPTC:Province-State',0,0,0,1,'string','','','0',0,1,9,NULL,NULL,0),(11,'Country','IPTC:Country-PrimaryLocationName',0,0,0,1,'string','','','0',0,1,10,NULL,NULL,0),(12,'OriginalRef','IPTC:OriginalTransmissionReference',0,0,0,1,'string','','','0',0,1,11,NULL,NULL,0),(13,'Headline','IPTC:Headline',0,0,0,1,'string','','','0',0,1,12,NULL,NULL,0),(14,'Credit','IPTC:Credit',0,0,0,1,'string','','','0',0,1,13,NULL,NULL,0),(15,'Source','IPTC:Source',0,0,0,1,'string','','','0',0,1,14,NULL,NULL,0),(16,'Caption','IPTC:Caption-Abstract',0,0,0,1,'string','','','0',0,1,15,NULL,NULL,0),(17,'CaptionWriter','IPTC:Writer-Editor',0,0,0,1,'string','','','0',0,1,16,NULL,NULL,0),(18,'Longitude','GPS:GPSLongitude',1,0,0,1,'string','','','0',0,1,17,NULL,NULL,0),(19,'Latitude','GPS:GPSLatitude',1,0,0,1,'string','','','0',0,1,18,NULL,NULL,0),(20,'CameraModel','IFD0:Model',1,0,0,1,'string','','','0',0,1,19,NULL,NULL,0),(21,'FileName','Phraseanet:tf-filename',1,0,0,1,'text','','','0',0,1,20,NULL,NULL,0),(22,'FilePath','Phraseanet:tf-filepath',1,0,0,1,'text','','','0',0,1,21,NULL,NULL,0),(23,'Recordid','Phraseanet:tf-recordid',1,0,0,1,'number','','','0',0,1,22,NULL,NULL,0),(24,'MimeType','Phraseanet:tf-mimetype',1,0,0,1,'text','','','0',0,1,23,NULL,NULL,0),(25,'Size','Phraseanet:tf-size',1,0,0,1,'number','','','0',0,1,24,NULL,NULL,0),(26,'Extension','Phraseanet:tf-extension',1,0,0,1,'text','','','0',0,1,25,NULL,NULL,0),(27,'Width','Phraseanet:tf-width',1,0,0,1,'number','','','0',0,1,26,NULL,NULL,0),(28,'Height','Phraseanet:tf-height',1,0,0,1,'number','','','0',0,1,27,NULL,NULL,0),(29,'Bits','Phraseanet:tf-bits',1,0,0,1,'number','','','0',0,1,28,NULL,NULL,0),(30,'Channels','Phraseanet:tf-channels',1,0,0,1,'number','','','0',0,1,29,NULL,NULL,0);
/*!40000 ALTER TABLE `metadatas_structure` ENABLE KEYS */;
UNLOCK TABLES;
@@ -2235,7 +2235,7 @@ CREATE TABLE `pref` (
LOCK TABLES `pref` WRITE;
/*!40000 ALTER TABLE `pref` DISABLE KEYS */;
-INSERT INTO `pref` VALUES (1,'thesaurus','','','0000-00-00 00:00:00','2012-04-27 02:06:31'),(2,'structure','\n\n /tmp/db_test/documents\n \n \n \n /tmp/db_test/subdefs\n 800\n resample\n 72\n no\n 75\n yes\n \n image\n \n \n \n \n /tmp/db_test/subdefs\n 200\n resample\n 72\n yes\n 75\n no\n image\n web//db_test/subdefs\n \n \n \n \n \n \n /tmp/db_test/subdefs\n 800\n video\n yes\n \n libfaac\n libx264\n 1000\n 8\n 15\n \n \n \n \n /tmp/db_test/subdefs\n 200\n gif\n 500\n no\n web//db_test/subdefs\n \n \n \n \n /tmp/db_test/subdefs\n 200\n image\n no\n web//db_test/subdefs\n \n \n \n \n \n \n /tmp/db_test/subdefs\n audio\n yes\n \n \n \n \n \n /tmp/db_test/subdefs\n image\n no\n web//db_test/subdefs\n \n \n \n \n \n \n /tmp/db_test/subdefs\n flexpaper\n no\n \n \n \n \n \n /tmp/db_test/subdefs\n image\n resample\n 72\n 200\n no\n web//db_test/subdefs\n \n \n \n \n \n \n /tmp/db_test/subdefs\n image\n 200\n no\n resample\n 72\n \n \n \n \n \n /tmp/db_test/subdefs\n image\n no\n resample\n 72\n web//db_test/subdefs\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n Online\n \n\n','','2012-04-27 02:06:34','2012-04-27 02:06:31'),(3,'cterms','','','0000-00-00 00:00:00','2012-04-27 02:06:31'),(4,'indexes','1','','2012-04-27 02:06:31','2012-04-27 02:06:31'),(5,'ToU','','fr_FR','0000-00-00 00:00:00','2012-04-27 02:06:31'),(6,'ToU','','ar_SA','0000-00-00 00:00:00','2012-04-27 02:06:31'),(7,'ToU','','de_DE','0000-00-00 00:00:00','2012-04-27 02:06:31'),(8,'ToU','','en_GB','0000-00-00 00:00:00','2012-04-27 02:06:31'),(9,'version','3.7.0.0.a2','','2012-04-27 02:06:33','0000-00-00 00:00:00');
+INSERT INTO `pref` VALUES (1,'thesaurus','','','0000-00-00 00:00:00','2012-04-27 02:06:31'),(2,'structure','\n\n /tmp/db_test/documents\n \n \n \n /tmp/db_test/subdefs\n 800\n resample\n 72\n no\n 75\n yes\n \n image\n \n \n \n \n /tmp/db_test/subdefs\n 200\n resample\n 72\n yes\n 75\n no\n image\n web//db_test/subdefs\n \n \n \n \n \n \n /tmp/db_test/subdefs\n 800\n video\n yes\n \n libfaac\n libx264\n 1000\n 8\n 15\n \n \n \n \n /tmp/db_test/subdefs\n 200\n gif\n 500\n no\n web//db_test/subdefs\n \n \n \n \n /tmp/db_test/subdefs\n 200\n image\n no\n web//db_test/subdefs\n \n \n \n \n \n \n /tmp/db_test/subdefs\n audio\n yes\n \n \n \n \n \n /tmp/db_test/subdefs\n image\n no\n web//db_test/subdefs\n \n \n \n \n \n \n /tmp/db_test/subdefs\n flexpaper\n no\n \n \n \n \n \n /tmp/db_test/subdefs\n image\n resample\n 72\n 200\n no\n web//db_test/subdefs\n \n \n \n \n \n \n /tmp/db_test/subdefs\n image\n 200\n no\n resample\n 72\n \n \n \n \n \n /tmp/db_test/subdefs\n image\n no\n resample\n 72\n web//db_test/subdefs\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n Online\n \n\n','','2012-04-27 02:06:34','2012-04-27 02:06:31'),(3,'cterms','','','0000-00-00 00:00:00','2012-04-27 02:06:31'),(4,'indexes','1','','2012-04-27 02:06:31','2012-04-27 02:06:31'),(5,'ToU','','fr_FR','0000-00-00 00:00:00','2012-04-27 02:06:31'),(6,'ToU','','ar_SA','0000-00-00 00:00:00','2012-04-27 02:06:31'),(7,'ToU','','de_DE','0000-00-00 00:00:00','2012-04-27 02:06:31'),(8,'ToU','','en_GB','0000-00-00 00:00:00','2012-04-27 02:06:31'),(9,'version','3.7.0.0.a2','','2012-04-27 02:06:33','0000-00-00 00:00:00');
/*!40000 ALTER TABLE `pref` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/lib/classes/patch/320c.class.php b/lib/classes/patch/320c.class.php
index 6fe2a5f734..918ee071cc 100644
--- a/lib/classes/patch/320c.class.php
+++ b/lib/classes/patch/320c.class.php
@@ -70,24 +70,24 @@ class patch_320c implements patchInterface
$phrasea_maps = array(
- 'pdftext' => '/rdf:RDF/rdf:Description/PHRASEANET:pdftext'
- , 'tf-archivedate' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-archivedate'
- , 'tf-atime' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-atime'
- , 'tf-chgdocdate' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-chgdocdate'
- , 'tf-ctime' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-ctime'
- , 'tf-editdate' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-editdate'
- , 'tf-mtime' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-mtime'
- , 'tf-parentdir' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-parentdir'
- , 'tf-bits' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-bits'
- , 'tf-channels' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-channels'
- , 'tf-extension' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-extension'
- , 'tf-filename' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-filename'
- , 'tf-filepath' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-filepath'
- , 'tf-height' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-height'
- , 'tf-mimetype' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-mimetype'
- , 'tf-recordid' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-recordid'
- , 'tf-size' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-size'
- , 'tf-width' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-width'
+ 'pdftext' => 'Phraseanet:pdftext'
+ , 'tf-archivedate' => 'Phraseanet:tf-archivedate'
+ , 'tf-atime' => 'Phraseanet:tf-atime'
+ , 'tf-chgdocdate' => 'Phraseanet:tf-chgdocdate'
+ , 'tf-ctime' => 'Phraseanet:tf-ctime'
+ , 'tf-editdate' => 'Phraseanet:tf-editdate'
+ , 'tf-mtime' => 'Phraseanet:tf-mtime'
+ , 'tf-parentdir' => 'Phraseanet:tf-parentdir'
+ , 'tf-bits' => 'Phraseanet:tf-bits'
+ , 'tf-channels' => 'Phraseanet:tf-channels'
+ , 'tf-extension' => 'Phraseanet:tf-extension'
+ , 'tf-filename' => 'Phraseanet:tf-filename'
+ , 'tf-filepath' => 'Phraseanet:tf-filepath'
+ , 'tf-height' => 'Phraseanet:tf-height'
+ , 'tf-mimetype' => 'Phraseanet:tf-mimetype'
+ , 'tf-recordid' => 'Phraseanet:tf-recordid'
+ , 'tf-size' => 'Phraseanet:tf-size'
+ , 'tf-width' => 'Phraseanet:tf-width'
);
$sxe = $databox->get_sxml_structure();
diff --git a/lib/conf.d/data_templates/en-simple.xml b/lib/conf.d/data_templates/en-simple.xml
index 3e26cb119c..bcf9900e23 100644
--- a/lib/conf.d/data_templates/en-simple.xml
+++ b/lib/conf.d/data_templates/en-simple.xml
@@ -133,27 +133,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/conf.d/data_templates/fr-simple.xml b/lib/conf.d/data_templates/fr-simple.xml
index 6a50f07e96..1ad99c68d4 100755
--- a/lib/conf.d/data_templates/fr-simple.xml
+++ b/lib/conf.d/data_templates/fr-simple.xml
@@ -133,27 +133,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/databox/databox_fieldTest.php b/tests/databox/databox_fieldTest.php
index 8aef2693d9..6d7d1a52f0 100644
--- a/tests/databox/databox_fieldTest.php
+++ b/tests/databox/databox_fieldTest.php
@@ -146,7 +146,7 @@ class databox_fieldTest extends PhraseanetPHPUnitAbstract
public function testSet_tag()
{
- $source = \databox_field::loadClassFromTagName('/rdf:RDF/rdf:Description/PHRASEANET:tf-basename');
+ $source = \databox_field::loadClassFromTagName('Phraseanet:tf-basename');
$this->object_mono->set_tag($source);
$this->object_multi->set_tag($source);