Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester: [96] WebEditor
|
From: <se...@us...> - 2008-05-06 22:43:52
|
Revision: 96
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=96&view=rev
Author: sem62
Date: 2008-05-06 15:43:58 -0700 (Tue, 06 May 2008)
Log Message:
-----------
modofied creating resource process.
Modified Paths:
--------------
WebEditor/service/getFileContent.php
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ChapterModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Template.java
WebEditor/src/edu/lnu/FireFly/WebEditor/WSClients/WebEditorServiceClient.java
WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java
Removed Paths:
-------------
WebEditor/service/copyFromTemplate.php
Deleted: WebEditor/service/copyFromTemplate.php
===================================================================
--- WebEditor/service/copyFromTemplate.php 2008-05-06 21:59:28 UTC (rev 95)
+++ WebEditor/service/copyFromTemplate.php 2008-05-06 22:43:58 UTC (rev 96)
@@ -1,10 +0,0 @@
-<?
- require_once("config.inc.php");
-
- if (isset($_POST['fNameInTemplate']) && isset($_POST['fNameInCourse'])){
- $log = fopen('service.txt', 'a');
- $source = $template_location . $_POST['fNameInTemplate'];
- $dest = $course_location . $_POST['fNameInCourse'];
- echo copy($source, $dest);
- }
-?>
\ No newline at end of file
Modified: WebEditor/service/getFileContent.php
===================================================================
--- WebEditor/service/getFileContent.php 2008-05-06 21:59:28 UTC (rev 95)
+++ WebEditor/service/getFileContent.php 2008-05-06 22:43:58 UTC (rev 96)
@@ -1,7 +1,11 @@
<?
require_once("config.inc.php");
- if (isset($_POST['fName'])){
- readfile ($course_location . $_POST['fName']);
+ if (isset($_POST['fName']) && isset($_POST['location'])){
+ if ($_POST['location'] == "course"){
+ readfile ($course_location . $_POST['fName']);
+ } else {
+ readfile ($template_location . $_POST['fName']);
+ }
}
?>
\ No newline at end of file
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ChapterModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ChapterModel.java 2008-05-06 21:59:28 UTC (rev 95)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ChapterModel.java 2008-05-06 22:43:58 UTC (rev 96)
@@ -145,7 +145,7 @@
identifier = ((Organization) anItem).identifier;
}
String res = WebEditorServiceClient
- .getFileContent(identifier + ".conf");
+ .getFileContent(identifier + ".conf", "course");
if (res == null || res.trim().equals("")){
return false;
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java 2008-05-06 21:59:28 UTC (rev 95)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java 2008-05-06 22:43:58 UTC (rev 96)
@@ -13,7 +13,6 @@
import edu.lnu.FireFly.FFManifest.resource.Resource;
import edu.lnu.FireFly.WebEditor.WebEditor;
import edu.lnu.FireFly.WebEditor.ItemModels.SummaryPageModel.SummaryPageModel;
-import edu.lnu.FireFly.WebEditor.WSClients.WebEditorServiceClient;
public abstract class ItemModel {
protected static HashMap<TreeItem, ItemData> questionsData = new HashMap<TreeItem, ItemData>();
@@ -77,17 +76,7 @@
String fName = resource.identifier + ".html";
resource.setHref(fName);
- boolean copied = WebEditorServiceClient.copyFromTemplate(this
- .getClass().getSimpleName()
- + ".html", fName);
- copied = copied
- && WebEditorServiceClient.copyFromTemplate(this.getClass()
- .getSimpleName()
- + ".conf", resource.identifier + ".conf");
-
- System.out.println("copied: " + copied);
-
WebEditor.instance.getManifest().resources.resources.add(resource);
return resource.identifier;
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java 2008-05-06 21:59:28 UTC (rev 95)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java 2008-05-06 22:43:58 UTC (rev 96)
@@ -51,7 +51,7 @@
.findResourceByIdentifier(((Item)anItem).identifierref);
String res = WebEditorServiceClient.getFileContent(resource.identifier
- + ".conf");
+ + ".conf", "course");
SAXReader reader = new SAXReader();
@@ -60,6 +60,7 @@
doc = reader.read(new StringReader(res));
} catch (Exception e) {
e.printStackTrace();
+ return false;
}
Element root = doc.getRootElement();
@@ -90,8 +91,6 @@
@Override
public void ConfigureItem(TreeItem item) {
- synchronizeItemWithResource((Item) item);
-
new LecturePropertiestsDlg().showDialog(item);
TreeDataModel.getInstance().treeNodesChanged(item);
WebEditor.tree.setSelectionPath(null);
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java 2008-05-06 21:59:28 UTC (rev 95)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java 2008-05-06 22:43:58 UTC (rev 96)
@@ -29,9 +29,6 @@
return;
}
- synchronizeItemWithResource(item);
- updateItemResource(item, true);
-
ConfigureItem(item);
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java 2008-05-06 21:59:28 UTC (rev 95)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java 2008-05-06 22:43:58 UTC (rev 96)
@@ -105,7 +105,7 @@
.findResourceByIdentifier(((Item)anItem).identifierref);
String res = WebEditorServiceClient.getFileContent(resource.identifier
- + ".conf");
+ + ".conf", "course");
SAXReader reader = new SAXReader();
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Template.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Template.java 2008-05-06 21:59:28 UTC (rev 95)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Template.java 2008-05-06 22:43:58 UTC (rev 96)
@@ -51,22 +51,17 @@
}
public boolean updateResource() {
- boolean copied = WebEditorServiceClient.copyFromTemplate(model
- .getClass().getSimpleName()
- + ".html", fileName);
+ String templateFileName = model.getClass().getSimpleName() + ".html";
- if (!copied){
- return false;
- }
-
- String res = WebEditorServiceClient.getFileContent(fileName);
+ String res = WebEditorServiceClient.getFileContent(templateFileName,
+ "template");
Iterator<String> iter = propertiests.keySet().iterator();
while (iter.hasNext()) {
String name = iter.next();
res = insertPropertyIntoResource(res, name, propertiests.get(name));
-
- if (res == null){
+
+ if (res == null) {
System.out.print("Property \"" + name + "\" isn't present.\n");
return false;
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/WSClients/WebEditorServiceClient.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/WSClients/WebEditorServiceClient.java 2008-05-06 21:59:28 UTC (rev 95)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/WSClients/WebEditorServiceClient.java 2008-05-06 22:43:58 UTC (rev 96)
@@ -10,13 +10,23 @@
import edu.lnu.FireFly.WebEditor.Settings;
public class WebEditorServiceClient {
- public static String getFileContent(String fName) {
+ /**
+ * @param fName File name
+ * @param location Location name = template | course
+ * @return
+ */
+ public static String getFileContent(String fName, String location) {
+ System.out.println("Getting file's content (fName=" + fName + "; location=" + location + ")...");
+
String result = "";
try {
// Construct data
String data = URLEncoder.encode("fName", "UTF-8") + "="
+ URLEncoder.encode(fName, "UTF-8");
+ data += "&" + URLEncoder.encode("location", "UTF-8") + "="
+ + URLEncoder.encode(location, "UTF-8");
+
// Send data
URL url = new URL(Settings.getInstance().getServiceLocation()
+ "getFileContent.php");
@@ -43,10 +53,13 @@
e.printStackTrace();
}
+ System.out.print("result: " + result);
return result;
}
public static void setFileContent(String fName, String content) {
+ System.out.println("Setting file's content (fName=" + fName + ")...");
+
String result = "";
try {
// Construct data
@@ -85,45 +98,45 @@
System.out.println(result);
}
- public static boolean copyFromTemplate(String fNameInTemplate,
- String fNameInCourse) {
- String result = "";
- try {
- // Construct data
- String data = URLEncoder.encode("fNameInTemplate", "UTF-8") + "="
- + URLEncoder.encode(fNameInTemplate, "UTF-8");
- data += "&" + URLEncoder.encode("fNameInCourse", "UTF-8") + "="
- + URLEncoder.encode(fNameInCourse, "UTF-8");
-
- // Send data
- URL url = new URL(Settings.getInstance().getServiceLocation()
- + "copyFromTemplate.php");
-
- URLConnection conn = url.openConnection();
- conn.setDoOutput(true);
-
- OutputStreamWriter wr = new OutputStreamWriter(conn
- .getOutputStream());
-
- wr.write(data);
- wr.flush();
-
- // Get the response
- BufferedReader rd = new BufferedReader(new InputStreamReader(conn
- .getInputStream()));
- String line;
- while ((line = rd.readLine()) != null) {
- result += line + "\n";
- }
- wr.close();
- rd.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- System.out.println("copyFromTemplate(). result is:");
- System.out.println(result);
-
- return true;
- }
+// public static boolean copyFromTemplate(String fNameInTemplate,
+// String fNameInCourse) {
+// String result = "";
+// try {
+// // Construct data
+// String data = URLEncoder.encode("fNameInTemplate", "UTF-8") + "="
+// + URLEncoder.encode(fNameInTemplate, "UTF-8");
+// data += "&" + URLEncoder.encode("fNameInCourse", "UTF-8") + "="
+// + URLEncoder.encode(fNameInCourse, "UTF-8");
+//
+// // Send data
+// URL url = new URL(Settings.getInstance().getServiceLocation()
+// + "copyFromTemplate.php");
+//
+// URLConnection conn = url.openConnection();
+// conn.setDoOutput(true);
+//
+// OutputStreamWriter wr = new OutputStreamWriter(conn
+// .getOutputStream());
+//
+// wr.write(data);
+// wr.flush();
+//
+// // Get the response
+// BufferedReader rd = new BufferedReader(new InputStreamReader(conn
+// .getInputStream()));
+// String line;
+// while ((line = rd.readLine()) != null) {
+// result += line + "\n";
+// }
+// wr.close();
+// rd.close();
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+//
+// System.out.println("copyFromTemplate(). result is:");
+// System.out.println(result);
+//
+// return true;
+// }
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java 2008-05-06 21:59:28 UTC (rev 95)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java 2008-05-06 22:43:58 UTC (rev 96)
@@ -71,7 +71,7 @@
private void openManifest() throws TestDocException {
Parser parser = new Parser();
manifest = parser.fromXML(WebEditorServiceClient
- .getFileContent("imsmanifest.xml"));
+ .getFileContent("imsmanifest.xml", "course"));
TreeDataModel.initInstance(manifest);
ItemModels.initializeAllItemDatas(manifest.getRoot());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
