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

Fix build

Browse Source
This commit is contained in:
Romain Neutron
2012-05-22 19:57:03 +02:00
parent 9d344b3647
commit 947a9dd3d1
6 changed files with 73 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
composer.lock generated
View File

@@ -110,34 +110,29 @@
"alias-version": "1.0.9999999.9999999-dev" "alias-version": "1.0.9999999.9999999-dev"
}, },
{ {
"package": "silex/silex", "package": "pimple/pimple",
"version": "dev-master", "version": "dev-master",
"source-reference": "24244da60407eff5d08dd5c460a7d23285be6995", "source-reference": "v1.0.0",
"alias-pretty-version": "1.0.x-dev", "alias-pretty-version": "1.0.x-dev",
"alias-version": "1.0.9999999.9999999-dev" "alias-version": "1.0.9999999.9999999-dev"
}, },
{ {
"package": "silex/silex", "package": "silex/silex",
"version": "dev-master", "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", "package": "silex/silex",
"version": "dev-master", "version": "dev-master",
"source-reference": "a0a78aff64ee5e9d218643646fcf819d4a626804", "source-reference": "6dcb25872210c50292516683ba541c1b29624afd"
"alias-pretty-version": "1.0.x-dev",
"alias-version": "1.0.9999999.9999999-dev"
}, },
{ {
"package": "swftools/swftools", "package": "swftools/swftools",
"version": "dev-master", "version": "dev-master",
"source-reference": "9e7668636baf3ef6c833d3bbd44ba17d4a062942" "source-reference": "9e7668636baf3ef6c833d3bbd44ba17d4a062942"
}, },
{
"package": "swiftmailer/swiftmailer",
"version": "dev-master",
"source-reference": "9895567cec5a13d1a43db5053defbaad260c1b87"
},
{ {
"package": "swiftmailer/swiftmailer", "package": "swiftmailer/swiftmailer",
"version": "dev-master", "version": "dev-master",
@@ -148,26 +143,17 @@
{ {
"package": "swiftmailer/swiftmailer", "package": "swiftmailer/swiftmailer",
"version": "dev-master", "version": "dev-master",
"source-reference": "57789082d1d53529dcf8cd3ca132d9787a59afee", "source-reference": "9895567cec5a13d1a43db5053defbaad260c1b87"
"alias-pretty-version": "4.1.x-dev",
"alias-version": "4.1.9999999.9999999-dev"
}, },
{ {
"package": "symfony/symfony", "package": "symfony/symfony",
"version": "dev-master", "version": "dev-master",
"source-reference": "ea33d4d377bacd6804ab9c304dbbd70cfc5d2860", "source-reference": "e0238071d4f07b46a07177066b6dd74ffb50fa5f"
"alias-pretty-version": "2.1.x-dev",
"alias-version": "2.1.9999999.9999999-dev"
}, },
{ {
"package": "symfony/symfony", "package": "symfony/symfony",
"version": "dev-master", "version": "dev-master",
"source-reference": "ea33d4d377bacd6804ab9c304dbbd70cfc5d2860" "source-reference": "e0238071d4f07b46a07177066b6dd74ffb50fa5f",
},
{
"package": "symfony/symfony",
"version": "dev-master",
"source-reference": "1e15f2109633723b710e87184643cad88004b1b9",
"alias-pretty-version": "2.1.x-dev", "alias-pretty-version": "2.1.x-dev",
"alias-version": "2.1.9999999.9999999-dev" "alias-version": "2.1.9999999.9999999-dev"
}, },
@@ -186,13 +172,6 @@
"version": "dev-master", "version": "dev-master",
"source-reference": "0fa26d642994630b2ec19c090149fa56ce84c789" "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", "package": "twig/twig",
"version": "dev-master", "version": "dev-master",

6
hudson/fixtures.sql
View File

File diff suppressed because one or more lines are too long

36
lib/classes/patch/320c.class.php
View File

@@ -70,24 +70,24 @@ class patch_320c implements patchInterface
$phrasea_maps = array( $phrasea_maps = array(
'pdftext' => '/rdf:RDF/rdf:Description/PHRASEANET:pdftext' 'pdftext' => 'Phraseanet:pdftext'
, 'tf-archivedate' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-archivedate' , 'tf-archivedate' => 'Phraseanet:tf-archivedate'
, 'tf-atime' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-atime' , 'tf-atime' => 'Phraseanet:tf-atime'
, 'tf-chgdocdate' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-chgdocdate' , 'tf-chgdocdate' => 'Phraseanet:tf-chgdocdate'
, 'tf-ctime' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-ctime' , 'tf-ctime' => 'Phraseanet:tf-ctime'
, 'tf-editdate' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-editdate' , 'tf-editdate' => 'Phraseanet:tf-editdate'
, 'tf-mtime' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-mtime' , 'tf-mtime' => 'Phraseanet:tf-mtime'
, 'tf-parentdir' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-parentdir' , 'tf-parentdir' => 'Phraseanet:tf-parentdir'
, 'tf-bits' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-bits' , 'tf-bits' => 'Phraseanet:tf-bits'
, 'tf-channels' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-channels' , 'tf-channels' => 'Phraseanet:tf-channels'
, 'tf-extension' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-extension' , 'tf-extension' => 'Phraseanet:tf-extension'
, 'tf-filename' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-filename' , 'tf-filename' => 'Phraseanet:tf-filename'
, 'tf-filepath' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-filepath' , 'tf-filepath' => 'Phraseanet:tf-filepath'
, 'tf-height' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-height' , 'tf-height' => 'Phraseanet:tf-height'
, 'tf-mimetype' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-mimetype' , 'tf-mimetype' => 'Phraseanet:tf-mimetype'
, 'tf-recordid' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-recordid' , 'tf-recordid' => 'Phraseanet:tf-recordid'
, 'tf-size' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-size' , 'tf-size' => 'Phraseanet:tf-size'
, 'tf-width' => '/rdf:RDF/rdf:Description/PHRASEANET:tf-width' , 'tf-width' => 'Phraseanet:tf-width'
); );
$sxe = $databox->get_sxml_structure(); $sxe = $databox->get_sxml_structure();

42
lib/conf.d/data_templates/en-simple.xml
View File

@@ -133,27 +133,27 @@
</subdefs> </subdefs>
<description> <description>
<Object src="/rdf:RDF/rdf:Description/IPTC:ObjectName" /> <Object src="IPTC:ObjectName" />
<Category src="/rdf:RDF/rdf:Description/IPTC:Category"/> <Category src="IPTC:Category"/>
<SupplCategory src="/rdf:RDF/rdf:Description/IPTC:SupplementalCategories"/> <SupplCategory src="IPTC:SupplementalCategories"/>
<Keywords src="/rdf:RDF/rdf:Description/IPTC:Keywords" multi="1"/> <Keywords src="IPTC:Keywords" multi="1"/>
<SpecialInstruct src="/rdf:RDF/rdf:Description/IPTC:SpecialInstructions"/> <SpecialInstruct src="IPTC:SpecialInstructions"/>
<Date src="/rdf:RDF/rdf:Description/IPTC:DateCreated" type="date" /> <Date src="IPTC:DateCreated" type="date" />
<Byline src="/rdf:RDF/rdf:Description/IPTC:By-line"/> <Byline src="IPTC:By-line"/>
<BylineTitle src="/rdf:RDF/rdf:Description/IPTC:By-lineTitle"/> <BylineTitle src="IPTC:By-lineTitle"/>
<City src="/rdf:RDF/rdf:Description/IPTC:City" /> <City src="IPTC:City" />
<Province src="/rdf:RDF/rdf:Description/IPTC:Province-State" /> <Province src="IPTC:Province-State" />
<Country src="/rdf:RDF/rdf:Description/IPTC:Country-PrimaryLocationName" /> <Country src="IPTC:Country-PrimaryLocationName" />
<OriginalRef src="/rdf:RDF/rdf:Description/IPTC:OriginalTransmissionReference" /> <OriginalRef src="IPTC:OriginalTransmissionReference" />
<Headline src="/rdf:RDF/rdf:Description/IPTC:Headline" report="1" /> <Headline src="IPTC:Headline" report="1" />
<Credit src="/rdf:RDF/rdf:Description/IPTC:Credit" report="1" /> <Credit src="IPTC:Credit" report="1" />
<Source src="/rdf:RDF/rdf:Description/IPTC:Source" /> <Source src="IPTC:Source" />
<Caption src="/rdf:RDF/rdf:Description/IPTC:Caption-Abstract" /> <Caption src="IPTC:Caption-Abstract" />
<CaptionWriter src="/rdf:RDF/rdf:Description/IPTC:Writer-Editor" /> <CaptionWriter src="IPTC:Writer-Editor" />
<Longitude src="/rdf:RDF/rdf:Description/GPS:GPSLongitude" readonly="1"/> <Longitude src="GPS:GPSLongitude" readonly="1"/>
<Latitude src="/rdf:RDF/rdf:Description/GPS:GPSLatitude" readonly="1"/> <Latitude src="GPS:GPSLatitude" readonly="1"/>
<CameraModel src="/rdf:RDF/rdf:Description/IFD0:Model" readonly="1"/> <CameraModel src="IFD0:Model" readonly="1"/>
<FileName src="/rdf:RDF/rdf:Description/PHRASEANET:tf-basename" readonly="1" type="text" /> <FileName src="Phraseanet:tf-basename" readonly="1" type="text" />
</description> </description>
<statbits> <statbits>

42
lib/conf.d/data_templates/fr-simple.xml
View File

@@ -133,27 +133,27 @@
<description> <description>
<Objet src="/rdf:RDF/rdf:Description/IPTC:ObjectName" /> <Objet src="IPTC:ObjectName" />
<Categorie src="/rdf:RDF/rdf:Description/IPTC:Category"/> <Categorie src="IPTC:Category"/>
<AutresCategories src="/rdf:RDF/rdf:Description/IPTC:SupplementalCategories"/> <AutresCategories src="IPTC:SupplementalCategories"/>
<MotsCles src="/rdf:RDF/rdf:Description/IPTC:Keywords" multi="1"/> <MotsCles src="IPTC:Keywords" multi="1"/>
<Observations src="/rdf:RDF/rdf:Description/IPTC:SpecialInstructions"/> <Observations src="IPTC:SpecialInstructions"/>
<Date src="/rdf:RDF/rdf:Description/IPTC:DateCreated" type="date" /> <Date src="IPTC:DateCreated" type="date" />
<Signature src="/rdf:RDF/rdf:Description/IPTC:By-line"/> <Signature src="IPTC:By-line"/>
<TitreCredits src="/rdf:RDF/rdf:Description/IPTC:By-lineTitle"/> <TitreCredits src="IPTC:By-lineTitle"/>
<Ville src="/rdf:RDF/rdf:Description/IPTC:City" /> <Ville src="IPTC:City" />
<Province src="/rdf:RDF/rdf:Description/IPTC:Province-State" /> <Province src="IPTC:Province-State" />
<Pays src="/rdf:RDF/rdf:Description/IPTC:Country-PrimaryLocationName" /> <Pays src="IPTC:Country-PrimaryLocationName" />
<ReferencesOriginales src="/rdf:RDF/rdf:Description/IPTC:OriginalTransmissionReference" /> <ReferencesOriginales src="IPTC:OriginalTransmissionReference" />
<Titre src="/rdf:RDF/rdf:Description/IPTC:Headline" report="1" /> <Titre src="IPTC:Headline" report="1" />
<Credit src="/rdf:RDF/rdf:Description/IPTC:Credit" report="1" /> <Credit src="IPTC:Credit" report="1" />
<Source src="/rdf:RDF/rdf:Description/IPTC:Source" /> <Source src="IPTC:Source" />
<Legende src="/rdf:RDF/rdf:Description/IPTC:Caption-Abstract" /> <Legende src="IPTC:Caption-Abstract" />
<Redacteur src="/rdf:RDF/rdf:Description/IPTC:Writer-Editor" /> <Redacteur src="IPTC:Writer-Editor" />
<Longitude src="/rdf:RDF/rdf:Description/GPS:GPSLongitude" readonly="1"/> <Longitude src="GPS:GPSLongitude" readonly="1"/>
<Latitude src="/rdf:RDF/rdf:Description/GPS:GPSLatitude" readonly="1"/> <Latitude src="GPS:GPSLatitude" readonly="1"/>
<AppareilPhoto src="/rdf:RDF/rdf:Description/IFD0:Model" readonly="1"/> <AppareilPhoto src="IFD0:Model" readonly="1"/>
<NomDeFichier src="/rdf:RDF/rdf:Description/PHRASEANET:tf-basename" readonly="1" type="text" /> <NomDeFichier src="Phraseanet:tf-basename" readonly="1" type="text" />
</description> </description>
<statbits> <statbits>

2
tests/databox/databox_fieldTest.php
View File

@@ -146,7 +146,7 @@ class databox_fieldTest extends PhraseanetPHPUnitAbstract
public function testSet_tag() 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_mono->set_tag($source);
$this->object_multi->set_tag($source); $this->object_multi->set_tag($source);