Commit b5f2498c authored by yihua.huang's avatar yihua.huang

remove nativeobject for rhino

parent 6e6b3cc8
package us.codecraft.webmagic.scripts; package us.codecraft.webmagic.scripts;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import sun.org.mozilla.javascript.internal.NativeObject;
import us.codecraft.webmagic.Page; import us.codecraft.webmagic.Page;
import us.codecraft.webmagic.Site; import us.codecraft.webmagic.Site;
import us.codecraft.webmagic.processor.PageProcessor; import us.codecraft.webmagic.processor.PageProcessor;
...@@ -12,7 +11,6 @@ import javax.script.ScriptEngineManager; ...@@ -12,7 +11,6 @@ import javax.script.ScriptEngineManager;
import javax.script.ScriptException; import javax.script.ScriptException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Map;
/** /**
* @author code4crafter@gmail.com * @author code4crafter@gmail.com
...@@ -53,19 +51,19 @@ public class ScriptProcessor implements PageProcessor { ...@@ -53,19 +51,19 @@ public class ScriptProcessor implements PageProcessor {
context.setAttribute("config", site, ScriptContext.ENGINE_SCOPE); context.setAttribute("config", site, ScriptContext.ENGINE_SCOPE);
try { try {
engine.eval(defines + "\n" + script, context); engine.eval(defines + "\n" + script, context);
switch (language) { // switch (language) {
case JavaScript: // case JavaScript:
NativeObject o = (NativeObject) engine.get("result"); // NativeObject o = (NativeObject) engine.get("result");
if (o != null) { // if (o != null) {
for (Map.Entry<Object, Object> objectObjectEntry : o.entrySet()) { // for (Map.Entry<Object, Object> objectObjectEntry : o.entrySet()) {
page.getResultItems().put(objectObjectEntry.getKey().toString(), objectObjectEntry.getValue()); // page.getResultItems().put(objectObjectEntry.getKey().toString(), objectObjectEntry.getValue());
} // }
} // }
break; // break;
case JRuby: // case JRuby:
Object o1 = engine.get("result"); // Object o1 = engine.get("result");
break; // break;
} // }
} catch (ScriptException e) { } catch (ScriptException e) {
e.printStackTrace(); e.printStackTrace();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment