--- a/client/src/Iri.Modernisation.Data/Ldt/Readers.cs Tue Feb 09 15:30:46 2010 +0100
+++ b/client/src/Iri.Modernisation.Data/Ldt/Readers.cs Wed Feb 10 14:09:58 2010 +0100
@@ -113,7 +113,7 @@
public static VideoBook ConvertToVideoBook(LDTFile ldt, IRIFile iri)
{
-
+ Dictionary<String,PolemicElement> polemicElement = new Dictionary<string,PolemicElement>();
// Initialisation du VideoBook
VideoBook _videoBook = new VideoBook()
{
@@ -138,7 +138,7 @@
foreach (IRIElement elem in Iens.Decoupages[0].Elements)
{
- _videoBook.Chapters[chapter].Index.Add(new SegmentIndex(_videoBook.Chapters[chapter])
+ SegmentIndex Si = new SegmentIndex(_videoBook.Chapters[chapter])
{
Id = elem.Id,
Title = elem.Title,
@@ -147,8 +147,10 @@
TimerIn = elem.Begin,
Duration = elem.Dur
- });
+ };
+ _videoBook.Chapters[chapter].Index.Add(Si);
totalDur += elem.Dur;
+ polemicElement.Add(Si.Id, Si);
}
chapter++;
}
@@ -166,25 +168,37 @@
{
User author = new User() {UserName = LDTAD.Author };
LDTElement elem = LDTAD.Elements[0];
-
- _videoBook.Chapters[chapterIndex].Annotations.Add(
- new Annotation(_videoBook.Chapters[chapterIndex])
- {
- Id = elem.Id,
- Title = elem.Title,
- Description = elem.Abstract,
- Tags = elem.Tags,
- TimerIn = new TimeSpan(0, 0, 0, 0, (int)elem.Begin),
- Duration = new TimeSpan(0, 0, 0, 0, (int)elem.Dur),
- Type = FactoryVideoLivre.DictionaryAnnotationDescriptions[BasicRelation[elem.Id]],
- Contributer = author
+ Annotation an = new Annotation(_videoBook.Chapters[chapterIndex])
+ {
+ Id = elem.Id,
+ Title = elem.Title,
+ Description = elem.Abstract,
+ Tags = elem.Tags,
+ TimerIn = new TimeSpan(0, 0, 0, 0, (int)elem.Begin),
+ Duration = new TimeSpan(0, 0, 0, 0, (int)elem.Dur),
+ Type = FactoryVideoLivre.DictionaryAnnotationDescriptions[BasicRelation[elem.Id]],
+ Contributer = author
- });
+ };
+ _videoBook.Chapters[chapterIndex].Annotations.Add(an
+ );
+ polemicElement.Add(an.Id,an);
}
chapterIndex++;
}
+ foreach (LDTRelation Rel in ldt.BasicRelations)
+ {
+ _videoBook.BasicLinks.Add(new PolemicLink()
+ {
+ FromElement = (polemicElement[Rel.IdElementFrom]),
+ ToElement = polemicElement[Rel.IdElementTo],
+ Title = Rel.Title,
+ Type = FactoryVideoLivre.DictionaryAnnotationDescriptions[Rel.Type]
+
+ });
+ }
_videoBook.Duration = iri.Body.Medias[0].Videos[0].Dur;
_videoBook.LdtPath = ldt.Path;
return _videoBook;
--- a/client/src/Iri.Modernisation.Data/Models/VideoBook.cs Tue Feb 09 15:30:46 2010 +0100
+++ b/client/src/Iri.Modernisation.Data/Models/VideoBook.cs Wed Feb 10 14:09:58 2010 +0100
@@ -83,13 +83,14 @@
LDTFile ldt = new LDTFile();
ldt.Project = new LDTProject()
{
-
+ Title = this.Title
};
ldt.Medias = new List<LDTMedia>()
{
new LDTMedia()
{
- Src = IriPath
+ Src = IriPath,
+
}
};
foreach (VideoChapter Vc in Chapters)
--- a/client/test/FranceCulture/FranceCulture/FranceCulture.Web/Content/FranceInterENMI29.ldt Tue Feb 09 15:30:46 2010 +0100
+++ b/client/test/FranceCulture/FranceCulture/FranceCulture.Web/Content/FranceInterENMI29.ldt Wed Feb 10 14:09:58 2010 +0100
@@ -4,48 +4,33 @@
<media id="" src="/Content/iri_matinalefi29nov2009/iri_matinalefi29nov2009.iri" video="" pict="" extra="" />
</medias>
<annotations>
- <content id="293da7d3-967b-47f6-80aa-151d03761251" title="" author="" abstract="">
- <decoupage id="a4906e03-68b4-490e-bc2d-73626c8044ef" author="TestUser">
+ <content id="28c161b4-de03-4a04-9d12-7a08bbdb99f1" title="" author="" abstract="">
+ <decoupage id="4adb0979-4bd2-417f-aa80-65cf1aa7649d" author="TestUser">
<title>Emission France Culture</title>
<abstract></abstract>
<elements>
- <element id="f511d11a-8627-4c56-b40c-0e24115d5eaa" begin="0" dur="636088" author="TestUser" date="09/02/2010 15:25:01" color="0" src="">
- <title>aze</title>
- <abstract>ze</abstract>
+ <element id="1b0e6e2f-3ea4-4b01-9639-ca16a1386cde" begin="0" dur="636088" author="TestUser" date="10/02/2010 14:07:49" color="0" src="">
+ <title>A</title>
+ <abstract>A</abstract>
<audio></audio>
<video></video>
<tags>
- <tag>aze</tag>
+ <tag>A</tag>
</tags>
</element>
</elements>
</decoupage>
- <decoupage id="8498b671-e918-4adf-a23b-7e3595ddfbd2" author="TestUser">
+ <decoupage id="a2def39f-789f-48f2-9e9b-d29ffab3190e" author="TestUser">
<title>Emission France Culture</title>
<abstract></abstract>
<elements>
- <element id="358f746a-57ad-43f4-ad9b-1520ecbaf3b8" begin="847179" dur="94825" author="TestUser" date="09/02/2010 15:25:01" color="0" src="">
- <title>tt</title>
- <abstract>tt</abstract>
+ <element id="537b7d83-ba91-456c-b36d-95cd6c022a9a" begin="0" dur="636088" author="TestUser" date="10/02/2010 14:07:49" color="0" src="">
+ <title>B</title>
+ <abstract>B</abstract>
<audio></audio>
<video></video>
<tags>
- <tag>tt</tag>
- </tags>
- </element>
- </elements>
- </decoupage>
- <decoupage id="2ae5a2e2-cd2a-4e82-aa3b-e3318b8a92a7" author="TestUser">
- <title>Emission France Culture</title>
- <abstract></abstract>
- <elements>
- <element id="c47def89-499a-420f-96cb-e5f401da8664" begin="1004233" dur="70378" author="TestUser" date="09/02/2010 15:25:01" color="0" src="">
- <title>ar</title>
- <abstract>arar</abstract>
- <audio></audio>
- <video></video>
- <tags>
- <tag>arar</tag>
+ <tag>B</tag>
</tags>
</element>
</elements>
@@ -55,8 +40,8 @@
<displays />
<edits />
<basicRelations>
- <relation idElementFrom="s_F47370B1-C509-1630-A07B-748EAB0156D8" idElementTo="358f746a-57ad-43f4-ad9b-1520ecbaf3b8" title="tt" type="Adhésion" />
- <relation idElementFrom="s_F47370B1-C509-1630-A07B-748EAB0156D8" idElementTo="c47def89-499a-420f-96cb-e5f401da8664" title="ar" type="Question" />
+ <relation idElementFrom="s_92506216-25D0-6E9F-A10B-748EAAFA09B9" idElementTo="1b0e6e2f-3ea4-4b01-9639-ca16a1386cde" title="A" type="Polémique" />
+ <relation idElementFrom="s_92506216-25D0-6E9F-A10B-748EAAFA09B9" idElementTo="537b7d83-ba91-456c-b36d-95cd6c022a9a" title="B" type="Adhésion" />
</basicRelations>
<polemicRelations />
</iri>
\ No newline at end of file
--- a/client/test/FranceCulture/FranceCulture/FranceCulture.Web/Content/iri_matinalefi28nov2009/iri_matinalefi28nov2009.iri Tue Feb 09 15:30:46 2010 +0100
+++ b/client/test/FranceCulture/FranceCulture/FranceCulture.Web/Content/iri_matinalefi28nov2009/iri_matinalefi28nov2009.iri Wed Feb 10 14:09:58 2010 +0100
@@ -832,7 +832,7 @@
<links/>
<medias>
<media id="video">
- <video dur="7231314" begin="0" src="http://localhost:11137/Content/iri_matinalefi28nov2009/iri_matinalefi28nov2009.mp3" id="a1" q=""/>
+ <video dur="7231314" begin="0" src="http://localhost:6848/Content/iri_matinalefi28nov2009/iri_matinalefi28nov2009.mp3" id="a1" q=""/>
</media>
</medias>
<display>
--- a/client/test/FranceCulture/FranceCulture/FranceCulture.Web/Content/iri_matinalefi29nov2009/iri_matinalefi29nov2009.iri Tue Feb 09 15:30:46 2010 +0100
+++ b/client/test/FranceCulture/FranceCulture/FranceCulture.Web/Content/iri_matinalefi29nov2009/iri_matinalefi29nov2009.iri Wed Feb 10 14:09:58 2010 +0100
@@ -541,7 +541,7 @@
<links/>
<medias>
<media id="video">
- <video dur="7209241" begin="0" src="http://localhost:11137/Content/iri_matinalefi29nov2009/iri_matinalefi29nov2009.mp3" id="a1" q="0"/>
+ <video dur="7209241" begin="0" src="http://localhost:6848/Content/iri_matinalefi29nov2009/iri_matinalefi29nov2009.mp3" id="a1" q="0"/>
</media>
</medias>
<display>