Mobai
/
magic-Dependency
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use RawText as source for JsonPath #589

master
yihua.huang 2017-06-04 07:24:56 +08:00
parent 211ac74389
commit 5de6205563
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webmagic-extension/src/main/java/us/codecraft/webmagic/model/PageModelExtractor.java
View File

@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static us.codecraft.webmagic.model.annotation.ExtractBy.Source.RawText;
/** /**
* The main internal logic of page model extractor. * The main internal logic of page model extractor.
* *
@ -125,9 +127,12 @@ class PageModelExtractor {
ExtractBy extractBy = field.getAnnotation(ExtractBy.class); ExtractBy extractBy = field.getAnnotation(ExtractBy.class);
if (extractBy != null) { if (extractBy != null) {
Selector selector = ExtractorUtils.getSelector(extractBy); Selector selector = ExtractorUtils.getSelector(extractBy);
ExtractBy.Source source0 = extractBy.source();
if (extractBy.type()== ExtractBy.Type.JsonPath){
source0 = RawText;
}
FieldExtractor.Source source = null; FieldExtractor.Source source = null;
switch (extractBy.source()){ switch (source0){
case RawText: case RawText:
source = FieldExtractor.Source.RawText; source = FieldExtractor.Source.RawText;
break; break;

2
webmagic-extension/src/test/java/us/codecraft/webmagic/model/PageModelExtractorTest.java
View File

@ -77,7 +77,7 @@ public class PageModelExtractorTest {
public static class ModelJsonStr { public static class ModelJsonStr {
@ExtractBy(type = ExtractBy.Type.JsonPath, value = "$.name",source = ExtractBy.Source.RawText) @ExtractBy(type = ExtractBy.Type.JsonPath, value = "$.name")
private String name; private String name;
} }