75d5e3475d
Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git
12 years ago
a2841261bd
content control: apply filter if enabled to crawls
12 years ago
dc468dad01
add content control features for custom filter lists
12 years ago
316b5fe116
- added a solr type definition verifier
...
- fixed type definition found by the verifier
- added multivalue-string fields for solr with extension 'sxt'
- added multivalue-integer fields for solr with extension 'val'
- renamed some solr attributes from txt to sxt
- changed solr query line to an explicit AND/OR structure
- added a country code second level domain list to Domains class; with
parser
- added a host string parser to get domain class name, country-code
second-level domain and subdomain out of it
- removed old coordinate attributes
12 years ago
a3d5959981
Merge commit '65d49df865f60511d22d86fb15c33a082176e7ab'
12 years ago
4521d63c92
added boosts to solr search queries
12 years ago
e8acd542b5
- added faceted drill-down for host and geolocation to solr queries
...
- added a new geolocation field to index schema, the old values are
migrated if possible
12 years ago
f00168ecc5
added gsa result attribute 'has'
12 years ago
65d49df865
security fix: clear automtic password only if adminAccountForLocalhost=false to prevent remote access to protected pages after restart.
...
if adminAccountForLocalhost=true leave automatic password unchanged so access from local host is granted but remote access is preventet from the 1st second.
12 years ago
2094df2e4e
- correct length computation for BStringObject (bugfix suggested by
...
apfelmaennchen)
- using ASCII for string conversion for Strings generated from Integer
12 years ago
6d03433cda
- added hack to prevent that stream servlet paths are not parsed wrongly
...
if the path contains a dot.
- added also warnings if documents are requests which do not exist.
12 years ago
67f2866cd0
small fixes
12 years ago
ce156a01ba
Merge commit 'c2341a175fdd755a34965ff63c7ea437b380352d'
12 years ago
c2341a175f
Fixed a bug that prevented Yacy from indexing files with non ASCII filenames in FTP servers.
...
Previously Yacy could read file listings in UTF-8, but couldn't send commands to the FTP server in UTF-8 (the second byte of every multi-byte character was ignored), which caused a lot of errors on the server side.
Now it handles UTF-8 correctly.
12 years ago
3ebc4264c5
fixed concurrent query
12 years ago
29171e2f6c
fixed generation of ontologies from index enumerations
12 years ago
7cd302de3e
omit xml parsing when using the embedded solr server
12 years ago
787e1c6836
added the
...
QueryResponse query(SolrParams params)
method to the SolrServerConnector which is necessary to use facets in
solr search.
12 years ago
01a63ef595
redesign of YaCySchema and SolrDoc handling
12 years ago
479bfca571
refctoring
12 years ago
48a82bc705
log queries anonymous from gsa+solr requests
12 years ago
ab6ec4ec52
added snippet computation to solr/rss and gsa result writer
12 years ago
4716546ef5
- reduced memory usage in index transmission using a transformation of
...
Node to Row objects
- removed peerDeparture in solr remote search in case that peer does not
answer (this may be normal because it is allowed to switch this off)
12 years ago
06b0081fdc
fix for NPE during host navigation computation
12 years ago
feb99bc291
fixed GSA format
12 years ago
653645c1cf
corrected solr query syntax
12 years ago
08ae142a3d
- enhanced caching after search queries to solr
...
- reduced caching after short memory
12 years ago
716ea0cfe2
sorted the solr schema into mandatory and optional fields; reduced
...
number of used field to reduce solr index size
12 years ago
9b8c8c0f47
fix from gaston in
...
http://forum.yacy-websuche.de/viewtopic.php?p=26909#p26909
12 years ago
acb9f04e80
removed unused classes
12 years ago
0ad52ac4c3
gsa bugfix for date parser
12 years ago
3ce4c2f937
fixes for gsa result format
12 years ago
67d235fae9
added gzip encoding to solr2sor http interface, client side (server
...
already works)
12 years ago
a049761e0c
fixed double-check
12 years ago
f42a57cd7d
gsa format update
12 years ago
b3aad6cc35
bugfix for remote search when search is done to solr
12 years ago
ff3eaa21b0
added remote search to solr on YaCy peers!
...
- when doing a remote search, node peers are selected for solr queries
- the solr query is done concurrently to the standard YaCy rwi search
- the solr search result is feeded into the same data structure that
prepares the rwi search result
- the same remote seach that is done to several outside peers is done to
the local solr index
- the search process works now also without any 'old' RWI data using
solr
12 years ago
a06123aec6
more abstraction and less parameter overhead for remote search
12 years ago
f00733186b
code simplifications
12 years ago
755f5e76cf
removed strange assert statements and simplified code in metadata
...
transformation
12 years ago
db0d438709
fix for http://bugs.yacy.net/view.php?id=206
12 years ago
404b0aab09
refactoring in remote search and stub for remote node peer selection
12 years ago
d7ea45f698
- get nice text_t values from metadata conversions that are stored into
...
solr as fulltext search index.
- added slow migration from old metadata to solr index entries: each
entry from the old metadata is removed from that data structure and
written into solr.
12 years ago
99ef57f103
reduced sleep times
12 years ago
780f8974e7
added ramaining iteration methods for solr in fulltext class
12 years ago
acd2dc3575
hack to removed StringBuilder overhead in query construction
12 years ago
ee01c12e56
fixes for putDocument and putMetadata
12 years ago
cc47a0876e
reverted bf55f69176
...
to have a fall-back option in case that memory problems as reported in
http://forum.yacy-websuche.de/viewtopic.php?p=26901#p26901
for full-solr installation are too strong and we have to work with an
'small memory footprint' peer system.
12 years ago
0904afe8fb
added concurrent iterator methods to the solr connectors
12 years ago
d54b80327a
refactoring
12 years ago
f9fc5cfaba
better check for bad urls in url transmission
12 years ago
d39463a85c
added deleteByQuery to solr connectors
12 years ago
0cab06c47c
refactoring
12 years ago
bf55f69176
removed write methods to old metadata file type; all metadata now goes
...
to solr
12 years ago
40c0856489
refactoring
12 years ago
06a78eecb7
code simplification
12 years ago
54bea21c02
bugfix for solr connector, possibly a cause for
...
http://forum.yacy-websuche.de/viewtopic.php?p=26893#p26893
12 years ago
9bece5ac5f
enhanced snippet fetch - removed a bug that caused documents to be
...
parsed even if a solr text was available
12 years ago
18f989dfb1
- refactoring (load -> getMetadata)
...
- added getDocument to retrieve Solr documents which shall replace
getMetadata
12 years ago
395b78a0d8
using the solr search index to concurrently search within solr and the
...
rwis during local search requests.
12 years ago
6197caf698
added clear-text search words in query params
12 years ago
efafa79db5
- added a content-encoding: gzip to streamed http server responses
...
- finish and close streamed http responses immediately
- this applies only to the solr interface which should be much faster
now!
12 years ago
23226676c6
FOR THE BRAVE.. this is a forced migration to solr which is now ready
...
for production as a replacement of the metadata-db.
This intermediate release 1.041 will switch on the previously optional
solr index and the old metadata-db will still work as it did before.
Solr+metadata are accessed in mixed mode, no migration is done yet.
If this causes not a catastrophe until the end of the weekend, we will
do a YaCy 1.1 main release containing this as default.
12 years ago
a1b2c9a67d
doctype2mime fix, influences metadata conversion between old metadata
...
and solr
12 years ago
a16206e38b
more attempts to clean the index (cleaning is faster then)
12 years ago
703f427303
fixed some peer-ping connection details
...
- larger time-out
- removed too old seedlist
- fixed a bug in connection test
12 years ago
597bb76e4f
get the peer location more quickly
12 years ago
1641835fef
replaced yacy xml encoding by solr xml encoding
12 years ago
89fe13e73d
enhanced GSA and RSS output format: corrected date, added some missing
...
fields, added xml encoding for utf8
12 years ago
ea49a8aa8c
Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git
12 years ago
d988ba50cf
added a very rudimentary, incomplete, non-verified GSA response writer
...
for solr. Try this:
http://localhost:8090/gsa/searchresult?q=pdf&site=col1&num=10
12 years ago
aab0b680c3
- added xslt support for solr result formats.
...
try i.e.
http://localhost:8090/solr/select?q=*:*&start=0&rows=10&wt=xslt&tr=json.xsl
- added servlet-side mime-type configuration for streamed servlets. this
is used for the result formatters in solr result formats
12 years ago
e2119f4e76
augmented browsing: replace htmlparser by jsoup, which is more stable
...
and reliable
12 years ago
9448d9a8a2
ups
12 years ago
e5ef840f40
- renamed DoubleSolrConnector to MirrorSolrConnector and added a
...
hit/miss/document cache to the MirrorSolrConnector.
- more abstraction to SolrDocument in Connector interface
- bugfixes in Solr field reader
12 years ago
94a334f128
another fix to the Solr metadata reading process and to the shutdown
...
process
12 years ago
b51df6c7e8
- added coordinate storage in solr schema
...
- fixed shutdown process
- fixed some solr-to-metadata reading
- added a large number of metadata attributes in ViewFile.html
12 years ago
da851c6071
Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git
12 years ago
bd4f03bc85
removed unused class
12 years ago
39f8eb60c3
tried to prevent calls to bad-hack getSize() method and reduced overhead
...
of that method a bit.
12 years ago
e816b88b55
changed behaviour of metadata storage: in case that any solr is
...
attached, the metadata is not written to the metadata-db, even if it is
enabled but instead to solr. This prevents that metadata is written in
two store systems at the same time. It is also the next step to migrate
the current metadata-db to solr.
12 years ago
2571e0d47a
removed unused classes
12 years ago
f9c0e6e950
- Implemented and integrated the URIMetadataNode object which is a
...
metadata representation from the solr index. This shall replace metadata
from the built-in database in the future.
- added the Solr-driven metadata into the search index of YaCy which
makes it now possible to run YaCy without the old metadata index. This
is a major stept forward to a full migration to Solr.
12 years ago
b2b480fff2
more abstraction of the YaCySchema -> Opensearch matching process
12 years ago
24462e9baa
set the title every time, it is possible that it has changed
12 years ago
dcc72799c4
better abstraction for result writers using controlled vocabularies and
...
URIRefs
12 years ago
136fcb1ad9
refactoring
12 years ago
a12f693ec9
added two response writer for embedded solr interface:
...
a rss/opensearch writer and an enhanced solr xml writer.
The enhanced solr writer has less configuration overhead than the
original writer and should by slightly faster. The rss/opensearch writer
is at this time slightly incomplete compared with the already existing
rss search result form YaCy and also snippets are missing at this time.
To test the new interface, open for example:
http://localhost:8090/solr/select?wt=rss&q=olympia
The wt-code for the new result writers are=
wt=rss for opensearch
wt=exml for the enhanced solr xml writer.
Additionally, the SRU search parameters had been added to the solr
interface which can now also be used for a normal solr/xml search.
12 years ago
bca4a16603
replaced the multivalue generic string field name suffix _ss by _txt
...
because _ss is not part of the standard solr example schema.
12 years ago
67edfd991c
Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git
12 years ago
d9173ba7ed
added more solr fields to integrate values from URIMetadataRow. All
...
writings to the Metadata-DB are now also done to solr. This includes
metadata transfer during search and rwi transfer.
The new/added solr fields are:
## time when resource was loaded
load_date_dt
## date until resource shall be considered as fresh
fresh_date_dt
## id of the host, a 6-byte hash that is part of the document id
host_id_s
## ids of referrer to this document
referrer_id_ss
## the md5 of the raw source
md5_s
## the name of the publisher of the document
publisher_t
## the language used in the document; starts with primary language
language_ss
## an external ranking value
ranking_i
## the size of the raw source
size_i
## number of links to audio resources
audiolinkscount_i
## number of links to video resources
videolinkscount_i
## number of links to application resources
applinkscount_i
12 years ago
3276508d1b
Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git
12 years ago
3ce04cecf3
bad hack to prevent a bug appearing in solr
12 years ago
f32aa9a49c
prevent merge of blobs that can't be handled in memory
12 years ago
bbd242afb4
fix for a NPE
12 years ago
24d9db1613
snippet retrieval loading processes may use a smaller minimum load time
...
value than crawling processes. This speeds up the search result
preparation dramatically.
12 years ago
ef488a15f7
Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git
12 years ago
1687737771
Abstraction of HandleMap and HandleSet
12 years ago
76b037a20a
check content domain fix:
...
search image/media should not show pages containing image/media
search text should show all/text but image/media
12 years ago
9cd409682f
close augmented stream if filled from cache to get its content
...
use augmented stream if proxyAugmentation is set only
12 years ago
e432bb9cd9
better calculation of possible saving in HeapReader index data structure
12 years ago
9549984c65
documentation/comments
12 years ago
3bcd9d622b
cleaned up classes and methods which are either superfluous at this time
...
or will be superfluous or subject of complete redesign after the
migration to solr. Removing these things now will make the transition to
solr more simple.
12 years ago
6f1ddb2519
Moved solr index-add method to the same method where the YaCy index is
...
written. Also done some code-cleanup.
12 years ago
315d83cfa0
cleanup
12 years ago
1f41d9c6f5
bugfix for a NPE
12 years ago
76202f068e
extended abstraction of local and remote solr index using one front-end
...
for index administration and querying.
12 years ago
d3f243e2e1
fixed node type calculation for principal peers
12 years ago
826967513b
changed options in IndexFederated_p to switch on/off parts of the index
...
individually. The settings are experimental and the values of the
settings will be overwritten when an index migration from urldb to solr
starts.
12 years ago
cba4ab862e
fix for http://bugs.yacy.net/view.php?id=202
12 years ago
69e743d9e3
- more abstraction for the RWI index as preparation for solr integration
...
- added options in search index to switch parts of the index on or off
12 years ago
05a3ffd03a
patches to ensure that solr connectors are active ony if they have a
...
solr object assigned and vice versa
13 years ago
5a3c829872
embedded solr is only initiated if it is activated with
...
IndexFederated_p.html
13 years ago
97b7bcf2a6
added a solr search index
...
- by default, a (empty) solr storage instance is created at
SEGMENTS/solr_36
- the index is written if in /IndexFederated_p.html the flag "embedded
solr search index" is switched on
- a standard solr query interface is available now with a new servlet at
http://127.0.0.1:8090/solr/select
To test this, do the following:
- switch to webportal mode
- switch on the feature as described
- do a crawl. this fills the solr index. The normal YaCy search will NOT
work now!
- do a solr query, like:
http://127.0.0.1:8090/solr/select?q= *:*
http://127.0.0.1:8090/solr/select?q=text_t:Help
play with different search fields as you can see in
/IndexFederated_p.html
You can use the standard solr query attributes as described in
http://wiki.apache.org/solr/SearchHandler
13 years ago
f0a079ac9f
allow larger log entries
13 years ago
9b48c9fe2e
removed a crawler overhead (terminated loop which searches greatest
...
stack that has zero-waiting urls). This should cause a slightly faster
crawl for crawl stacks with many different domains in the crawl queue.
13 years ago
784a4abb18
enhancement in internal data organization which should generate less
...
synchronizations in database access
13 years ago
f78ce93a80
collection of speed and memory saving hacks
13 years ago
c00a3cf74d
less usage of generic logger to avoid logger generation overhead
13 years ago
a196f24f60
prevent enqueueing of non-loggeable logging entries
13 years ago
482afed07c
reduced logging overhead (a bit)
13 years ago
e76159040b
Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git
13 years ago
bbfa497a3c
replaced more size() > 0 by !isEmpty()
13 years ago
58e7d1952f
reduction of logging to prevent too much IO caused be logging
13 years ago
83da68c4c1
fixed a memory leak inside the logger which appeared if the log was
...
writter faster that the logger is able to print this out to its out
stream. A very large collection of unwritten log outputs had been seen
during strong crawling. The new ArrayBlockingQueue is limited to prevent
this case.
13 years ago
0cbda0b2b8
- replaced all length() == 0 and size() == 0 with isEmpty()
...
- replaced some length() > 0 and size() > 0 with !isEmpty() - cannot be
done automatically
- implemented some isEmpty() methods
13 years ago
28b30231c3
fix for url matcher of multiple amp& in an url, see:
...
http://forum.yacy-websuche.de/viewtopic.php?f=8&t=4439&p=26650#p26650
13 years ago
aef9dd0350
- removed cleaning of blacklist cache on startup
...
- added cleaning of blacklist cache if cache is modified in interface
- extended cache saving to all cache types
- moved cache location to DATA/LISTS
- fixed static file path which was relative to the application path but
should be relative to data path - which is different in debian and mac
implementations
13 years ago
c7afa8bc48
using SwitchboardConstants for solr attributes
13 years ago
c6d8950651
Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git
13 years ago
5f3b8dc040
fix for RSS reader
13 years ago
62202e2d71
refactoring of query attribute variable names for better consistency
...
with (next) stored query words
13 years ago
1addbc792c
use less memory for md5 cache
13 years ago
f32de94723
more logging
13 years ago
d09d9f2364
filter old peers from bootstrap (now stronger: 60 minutes instead of
...
240).
13 years ago
434ee90c59
added classification for control file types which shall not be loaded
...
but placed onto the noload-queue
13 years ago
a90bcb48f6
added webm
13 years ago
801972fe6f
fix for url camel case parser and sentence reader
13 years ago
fbc1a2030d
fix for sitemap importer: can now also import very large sitemaps within
...
small memory configurations
13 years ago
92731e5287
fix for sevenzip parser
13 years ago
45641b0c23
catch and log a warning in RasterPlotter
13 years ago
8efc1c1078
- fixed a memory leak (or bad usage) during parsing/snippet fetch
...
- more logging for errors
13 years ago
c3db015410
prevent loading of content from the cache when retrieval with IFFRESH is
...
used and cache is stale. Should speed up snippet generation when cache
strategy is IFFRESH.
13 years ago
b1e7c11fba
fix for pattern matcher in html parser
13 years ago
8a6edc0031
fix for solr shutdown
13 years ago
b8bcc06283
fix for urls beginning with "//"
13 years ago
b0c408788b
made class methods static where possible
13 years ago
5bd3c90907
- removed unnecessary semicolons
...
- added default case for switch
13 years ago
132afaf687
removed unaccessible code
13 years ago
7c1ba99755
removed more unused method parameters
13 years ago
83701a1b4c
removed unused ImageReference package
13 years ago
0301aba1e9
removed unused method parameters
13 years ago
241dd8410a
removed snippet pattern filter - it was not used
13 years ago
d3964253ae
- added @SuppressWarnings to unused servlet method parameters
...
- removed unnecessary casts
- removed unnecessary throw statements
13 years ago
ea10766bfd
cleaned unnecessary nested code
13 years ago
1481037820
replaced non-generic array with collection
13 years ago
fc0f9543fe
More SentenceReader cleanup
13 years ago
586bb0eb6a
Simplified SentenceReader (no more Reader inside..)
13 years ago
7f851d62a7
replaced HashARC with SizeLimited Objects which are less costly
13 years ago
d4291ac1f3
more tolerance when creating solar document
13 years ago
78fc3cf8f8
refactoring and new usage of SentenceReader: this class appeared as one
...
of the major CPU users during snippet verification. The class was not
efficient for two reasons:
- it used a too complex input stream; generated from sources and UTF8
byte-conversions. The BufferedReader applied a strong overhead.
- to feed data into the SentenceReader, multiple toString/getBytes had
been applied until a buffered Reader from an input stream was possible.
These superfluous conversions had been removed.
- the best source for the Sentence Reader is a String. Therefore the
production of Strings had been forced inside the Document class.
13 years ago
bb8dcb4911
automatically adopt size of word cache to available memory
13 years ago
ad09b786bf
clean up parser data
13 years ago
276a66a793
Adding a limit of 1000 links that a parser shall store during indexing.
...
A limit was necessary because some web pages have such huge numbers of
links that it can easily cause a OOM just by the number of links.
The quesion if the number of 1000 links is sufficient or too weak must
be answered with the result of testing this feature.
13 years ago
613b45f604
- better data structures in secondary search
...
- fixed a big memory leak in secondary search
13 years ago
de903a53a0
parser refactoring & hacks
13 years ago
8a82609360
- smaller caches to save memory
...
- close cloneable iterators to free memory
13 years ago
7249d9c9de
bugfix for concurrent seed loader
13 years ago
c72d3b12cd
concurrently initialize the seed list during p2p network bootstrap
13 years ago
1825f165b8
better integration of blacklist according to use case
13 years ago
c18fa9fa75
Merge branch 'master' of git://gitorious.org/~reger/yacy/bbyacy-rc1
13 years ago
ce8d4b87d9
fixes for new eclipse 'Juno' warning 'Resource leak'.
13 years ago
0c345d1559
giving threads name so its easier to see whats happening during
...
debugging and within a thread dump
13 years ago
067728bccc
add search result heuristic. adding a crawl job with depth-1 for every displayed search result (crawling every external linked page of displayed search result pages)
13 years ago
03280fb161
removed segments-concept and the Segments class:
...
the segments had been there to create a tenant-infrastructure but were
never be used since that was all much too complex. There will be a
replacement using a solr navigation using a segment field in the search
index.
13 years ago
508a81b86c
added solr field 'refresh_s' which stores the refresh url contained in
...
the meta-refresh html header field.
13 years ago
f3167def64
do not fill the keywords with title content if keywords do not exist.
13 years ago
9116013c64
- allow lazy initialization of solr value (if using 'lazy', then no
...
0-values and no empty strings are written). This may save a lot of
memory (in ram and on disc) if excessive 0-values or empty strings
appear)
- do not allow default boolean values for checkboxes because that does
not make sense: browsers may omit the checkbox attribute name if the box
is not checked. A default value 'true' would not comply with the
semantic of the browsers response.
- add a checkbox in IndexFederated_p for the lazy initialization of solr
fields.
13 years ago
97f60010d8
fix crawl start from file
13 years ago
0294a53459
- add canonical field only if requested by solr schema
...
- remove canonical url from in/outbound urls if present
13 years ago
3fd4a01286
added option to record urls that are forwarded to the solr index
13 years ago
d763e4d94b
fixed bad referer computation in SSIs which causes a NPE during host
...
computation. This error was there before the latest IPv6 hack but did
not cause a NPE. The IPv6 hack was not the cause for this bug, but it
discovered the misconfiguration of the 'referer' referrer.
13 years ago
358b04885e
more IPv6 hacks
13 years ago
96aeb127e3
generalized localhost naming.
...
this is also a preparation for a better IPv6 implementation.
13 years ago
77f795756c
fixing redirects and status codes: storing of status code in
...
ResponseHeader to make it available for late evaluations, like storage
in solr.
13 years ago
8dd469b9dd
added option to configure the autocommit delay time of solr on-the-fly
13 years ago
b9dfca4b0a
- fixed IndexFederated Servlet / a embedded Solr can now be selected
...
- added code stub for an embedded Solr but generation of Solr store is
still commented out (it works but is not yet ready for usage)
13 years ago
fad3b14813
added jetty libraries, needed for future use as web server and as
...
application server for the solr search interface
13 years ago
a38b0a2c46
extended embedded solr tests to ensure that it will be usable within a
...
jetty instance
13 years ago
b9d42fd9c8
using com.google.common.io.Files instead of homebrew methods
13 years ago
a5eb91fa60
refactoring
13 years ago
1be0025a9c
- added test for EmbeddedSolrConnector
...
- added needed libraries for this test
this includes most (all) files needed for an embedded solr
13 years ago
dbdd697f4d
moved RDFaParser.xsl configuration file to defaults
13 years ago
90b82ce994
using guava for host resolution (non-blocking for ips) and time-out
13 years ago
e12bb254b4
Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git
13 years ago
3f55dc7c1e
- added solr core and libraries that solr needs (lucene is missing, will
...
follow later)
- added embedded solr connector which can connect to solr
programmatically (without using a server in between)
13 years ago
c337190a00
Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git
13 years ago
c63c3a4495
Show additional interaction elements in footer section on each page, if
...
activated in ConfigPortal.html.
This footer is also visible in augmented browsing proxy mode.
13 years ago
786be7d175
better integration of RDFaParser
13 years ago
de3ef8ad73
removed unimportant warnings
13 years ago
Michael Peter Christen