Merge branch 'master' of github.com:scjoerg/WeCompare

scjoerg · Dec 22, 2011 · c84c02d · c84c02d
2 parents a9115f8 + 9896343
commit c84c02d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/report/.~lock.report.fodt# b/report/.~lock.report.fodt#
@@ -1 +1 @@
-Mariusz Wisniewski,mariusz,mariusz-laptop,22.12.2011 13:15,file:///home/mariusz/.libreoffice/3;
+Mariusz Wisniewski,mariusz,mariusz-laptop,22.12.2011 13:53,file:///home/mariusz/.libreoffice/3;
diff --git a/report/report.fodt b/report/report.fodt
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
- <office:meta><meta:creation-date>2011-11-16T13:42:26</meta:creation-date><dc:date>2011-12-22T13:15:19</dc:date><meta:editing-duration>PT3H3M22S</meta:editing-duration><meta:editing-cycles>19</meta:editing-cycles><meta:generator>LibreOffice/3.4$Linux LibreOffice_project/340m1$Build-402</meta:generator><dc:title>Project report</dc:title><meta:document-statistic meta:table-count="0" meta:image-count="7" meta:object-count="0" meta:page-count="8" meta:paragraph-count="54" meta:word-count="1722" meta:character-count="9519" meta:non-whitespace-character-count="7847"/><dc:creator>Mariusz Wisniewski</dc:creator><meta:user-defined meta:name="Author">Jörg, Mariusz, Michael</meta:user-defined></office:meta>
+ <office:meta><meta:creation-date>2011-11-16T13:42:26</meta:creation-date><dc:date>2011-12-22T13:53:29</dc:date><meta:editing-duration>PT3H41M32S</meta:editing-duration><meta:editing-cycles>20</meta:editing-cycles><meta:generator>LibreOffice/3.4$Linux LibreOffice_project/340m1$Build-402</meta:generator><dc:title>Project report</dc:title><dc:creator>Mariusz Wisniewski</dc:creator><meta:document-statistic meta:table-count="0" meta:image-count="7" meta:object-count="0" meta:page-count="8" meta:paragraph-count="54" meta:word-count="1732" meta:character-count="9581" meta:non-whitespace-character-count="7899"/><meta:user-defined meta:name="Author">Jörg, Mariusz, Michael</meta:user-defined></office:meta>
  <office:settings>
   <config:config-item-set config:name="ooo:view-settings">
-   <config:config-item config:name="ViewAreaTop" config:type="int">9948</config:config-item>
+   <config:config-item config:name="ViewAreaTop" config:type="int">178435</config:config-item>
    <config:config-item config:name="ViewAreaLeft" config:type="int">0</config:config-item>
    <config:config-item config:name="ViewAreaWidth" config:type="int">36858</config:config-item>
-   <config:config-item config:name="ViewAreaHeight" config:type="int">17597</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="int">16512</config:config-item>
    <config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item>
    <config:config-item config:name="InBrowseMode" config:type="boolean">false</config:config-item>
    <config:config-item-map-indexed config:name="Views">
     <config:config-item-map-entry>
      <config:config-item config:name="ViewId" config:type="string">view2</config:config-item>
-     <config:config-item config:name="ViewLeft" config:type="int">9929</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="int">164950</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="int">12876</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="int">190057</config:config-item>
      <config:config-item config:name="VisibleLeft" config:type="int">0</config:config-item>
-     <config:config-item config:name="VisibleTop" config:type="int">9948</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="int">178435</config:config-item>
      <config:config-item config:name="VisibleRight" config:type="int">36856</config:config-item>
-     <config:config-item config:name="VisibleBottom" config:type="int">27543</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="int">194945</config:config-item>
      <config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
      <config:config-item config:name="ViewLayoutColumns" config:type="short">0</config:config-item>
      <config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item>
@@ -104,6 +104,7 @@
  </office:scripts>
  <office:font-face-decls>
   <style:font-face style:name="OpenSymbol" svg:font-family="OpenSymbol"/>
+  <style:font-face style:name="Times New Roman1" svg:font-family="&apos;Times New Roman&apos;"/>
   <style:font-face style:name="Palatino1" svg:font-family="Palatino" style:font-adornments="Bold" style:font-family-generic="roman" style:font-pitch="variable"/>
   <style:font-face style:name="Palatino2" svg:font-family="Palatino" style:font-adornments="Bold Italic" style:font-family-generic="roman" style:font-pitch="variable"/>
   <style:font-face style:name="Palatino" svg:font-family="Palatino" style:font-adornments="Regular" style:font-family-generic="roman" style:font-pitch="variable"/>
@@ -394,6 +395,15 @@
   <style:style style:name="T3" style:family="text">
    <style:text-properties style:font-name-asian="Arial"/>
   </style:style>
+  <style:style style:name="T4" style:family="text">
+   <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" fo:letter-spacing="normal"/>
+  </style:style>
+  <style:style style:name="T5" style:family="text">
+   <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" fo:letter-spacing="normal" fo:language="en" fo:country="US" style:language-complex="en" style:country-complex="US"/>
+  </style:style>
+  <style:style style:name="T6" style:family="text">
+   <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" style:font-name="Times New Roman1" fo:letter-spacing="normal" fo:font-style="normal" fo:font-weight="normal"/>
+  </style:style>
   <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
    <style:graphic-properties style:horizontal-pos="right" style:horizontal-rel="paragraph" style:mirror="none" fo:clip="rect(0cm, 0cm, 0cm, 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"/>
   </style:style>
@@ -2854,7 +2864,7 @@
     <text:p text:style-name="P2"/>
    </style:header>
    <style:footer>
-    <text:p text:style-name="P3"><text:user-defined style:data-style-name="N0" text:name="Author">Jörg, Mariusz, Michael</text:user-defined><text:tab/><text:page-number text:select-page="current">8</text:page-number> | <text:page-count>8</text:page-count><text:tab/><text:date style:data-style-name="N108" text:date-value="2011-12-22T13:15:19">December 2011</text:date></text:p>
+    <text:p text:style-name="P3"><text:user-defined style:data-style-name="N0" text:name="Author">Jörg, Mariusz, Michael</text:user-defined><text:tab/><text:page-number text:select-page="current">7</text:page-number> | <text:page-count>8</text:page-count><text:tab/><text:date style:data-style-name="N108" text:date-value="2011-12-22T13:53:28.99">December 2011</text:date></text:p>
    </style:footer>
   </style:master-page>
   <style:master-page style:name="First_20_Page" style:display-name="First Page" style:page-layout-name="pm2" style:next-style-name="Standard"/>
@@ -26336,7 +26346,7 @@
    <text:h text:style-name="P25" text:outline-level="2">Problems<text:span text:style-name="T3"> </text:span>encountered</text:h>
    <text:p text:style-name="P10">We had some problems coding in Javascript, since none of us ever really used it for a serious project before. We had to spend some time before getting comfortable coding in it and using the JQuery library.</text:p>
    <text:h text:style-name="P26" text:outline-level="3"><text:soft-page-break/>Database Interfacing</text:h>
-   <text:p text:style-name="P10">One of the biggest problems we encountered was the connection between the database and the client sided application. Indeed, connecting and querying the database from Javascript was really problematic, and rdfQuery was not as useful as we expected it to be. RdfQuery helped us to create databanks to store the information for each webpage in the browser; but further we needed to find the right combination of interfaces to put this data afterward through the use of Ajax in the Redstore.</text:p>
+   <text:p text:style-name="Standard"><text:span text:style-name="T2">One of the biggest problems we encountered was the connection between the database and the client sided application. Indeed, connecting and querying the database from Javascript was really problematic, and rdfQuery was not as useful as we expected it to be. RdfQuery helped us to create databanks to store the information for each webpage in the browser; but further we needed to find the right combination of interfaces to put this data afterward through the use of Ajax in the Redstore. We used JSON, a lightweight data-interchange format to do so.</text:span></text:p>
    <text:h text:style-name="P26" text:outline-level="3">Same origin policy</text:h>
    <text:p text:style-name="P10">A browser security feature is that Ajax queries need to be issued on the same domain name as the origin of the website. This means we had to find a way to put the Redstore interface in the same domain space as the website itself. After a lot of tries we got this working by Reverse-Proxying through Apache2 to the Redstore. At the end the database interface is reachable at www.wecompare.ch/redstore/.</text:p>
    <text:h text:style-name="P26" text:outline-level="3">IFrame URL fetching</text:h>